Compare commits
1
Commits
v2.0.5
..
734703eddc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
734703eddc |
+151
-236
@@ -1,252 +1,167 @@
|
|||||||
# ##############################################################
|
|
||||||
# #
|
|
||||||
# # .editorconfig – Hellion Forge / Hellion Media
|
|
||||||
# #
|
|
||||||
# # Überarbeitet: Mai 2026
|
|
||||||
# #
|
|
||||||
# # Strategie:
|
|
||||||
# # - Standard-.NET-Conventions (private Fields = _camelCase)
|
|
||||||
# # - CSharpier übernimmt die meiste Formatierung
|
|
||||||
# # - Hier: Naming, IDE-Hints, Backup-Format-Regeln
|
|
||||||
# #
|
|
||||||
# # ##############################################################
|
|
||||||
|
|
||||||
root = true
|
|
||||||
|
|
||||||
|
|
||||||
# =====================================================
|
|
||||||
# Defaults (alle Files)
|
|
||||||
# =====================================================
|
|
||||||
|
|
||||||
[*]
|
[*]
|
||||||
indent_style = space
|
indent_style=space
|
||||||
tab_width = 4
|
tab_width=4
|
||||||
indent_size = 4
|
indent_size=4
|
||||||
charset = utf-8
|
trim_trailing_whitespace=true
|
||||||
end_of_line = lf
|
insert_final_newline=false
|
||||||
trim_trailing_whitespace = true
|
|
||||||
insert_final_newline = true
|
|
||||||
|
|
||||||
|
# JetBrains Rider custom properties for code formatting styles
|
||||||
# =====================================================
|
resharper_csharp_brace_style=next_line
|
||||||
# Markdown: Trailing Spaces erlaubt (2 Spaces = <br>)
|
# Allman für standard Tooling (VS Code)
|
||||||
# =====================================================
|
|
||||||
|
|
||||||
[*.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
|
||||||
# .NET Style – Qualification (kein "this." nötig)
|
csharp_new_line_before_members_in_object_initializers=false
|
||||||
# =====================================================
|
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
|
||||||
|
|
||||||
dotnet_style_qualification_for_field = false:suggestion
|
# ReSharper properties
|
||||||
dotnet_style_qualification_for_property = false:suggestion
|
resharper_autodetect_indent_settings=true
|
||||||
dotnet_style_qualification_for_method = false:suggestion
|
resharper_cpp_insert_final_newline=true
|
||||||
dotnet_style_qualification_for_event = false:suggestion
|
resharper_csharp_insert_final_newline=false
|
||||||
|
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}]
|
||||||
# .NET Style – Predefined Types (int statt Int32 etc.)
|
indent_style=space
|
||||||
# =====================================================
|
indent_size=2
|
||||||
|
|
||||||
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
|
[{*.yaml,*.yml}]
|
||||||
dotnet_style_predefined_type_for_member_access = true:suggestion
|
indent_style=space
|
||||||
|
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
|
||||||
# .NET Style – Parentheses
|
indent_size=4
|
||||||
# =====================================================
|
tab_width=4
|
||||||
|
[*.md]
|
||||||
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
|
trim_trailing_whitespace=false
|
||||||
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
|
|
||||||
+16
-47
@@ -1,50 +1,19 @@
|
|||||||
##############################################################
|
# Local development environment template
|
||||||
##
|
|
||||||
## .env.example – Hellion Forge / Hellion Media
|
|
||||||
##
|
|
||||||
## Template für lokale Entwicklungsumgebung.
|
|
||||||
## Kopiere diese Datei nach `.env` und passe die Pfade
|
|
||||||
## an dein Setup an.
|
|
||||||
##
|
|
||||||
## ⚠️ `.env` ist gitignored – niemals lokale Pfade committen!
|
|
||||||
##
|
|
||||||
##############################################################
|
|
||||||
##
|
|
||||||
## 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
|
|
||||||
##
|
|
||||||
##############################################################
|
|
||||||
|
|
||||||
|
|
||||||
# =====================================================
|
|
||||||
# Build & Development Paths
|
|
||||||
# =====================================================
|
|
||||||
|
|
||||||
# Pfad zu den Dalamud-Development-DLLs:
|
|
||||||
# - Dalamud.dll
|
|
||||||
# - FFXIVClientStructs.dll
|
|
||||||
# - Lumina.dll
|
|
||||||
# - Lumina.Excel.dll
|
|
||||||
#
|
#
|
||||||
# Wird zum Bauen des HellionChat.Tests-Projekts benötigt.
|
# Copy this file to `.env` and adjust paths to your setup,
|
||||||
|
# or run: bash scripts/setup-dev-env.sh
|
||||||
#
|
#
|
||||||
# Standardpfade je nach Plattform:
|
# `.env` is gitignored — never commit your local paths.
|
||||||
# XIVLauncher Core (Linux): ~/.xlcore/dalamud/Hooks/dev
|
#
|
||||||
# XIVLauncher (Windows): %AppData%\XIVLauncher\addon\Hooks\dev
|
# Activate in shell:
|
||||||
# XIVLauncher (macOS): ~/Library/Application Support/XIV on Mac/dalamud/Hooks/dev
|
# set -a; source .env; set +a
|
||||||
|
#
|
||||||
|
# Or use direnv (recommended):
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
# XIVLauncher Core (Linux): ~/.xlcore/dalamud/Hooks/dev
|
||||||
|
# XIVLauncher (Windows): %AppData%\XIVLauncher\addon\Hooks\dev
|
||||||
DALAMUD_HOME=/path/to/dalamud/dev/dlls
|
DALAMUD_HOME=/path/to/dalamud/dev/dlls
|
||||||
|
|||||||
+7
-177
@@ -1,178 +1,8 @@
|
|||||||
##############################################################
|
# Generated files
|
||||||
##
|
|
||||||
## .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
|
|
||||||
|
|
||||||
|
|
||||||
# =====================================================
|
|
||||||
# Source Code (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
|
HellionChat/Resources/Language.*.resx linguist-generated=true
|
||||||
|
* text=auto eol=lf
|
||||||
*.resx text eol=lf
|
*.cs text eol=lf
|
||||||
*.resw text eol=lf
|
*.yml text eol=lf
|
||||||
|
*.yaml text eol=lf
|
||||||
|
*.md text eol=lf
|
||||||
# =====================================================
|
*.json 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
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
name: Build
|
|
||||||
|
|
||||||
# Verifies that every push to main and every PR still builds against the
|
|
||||||
# current Dalamud staging branch. Does not produce release artefacts; the
|
|
||||||
# release workflow handles that on tag.
|
|
||||||
#
|
|
||||||
# Linux runner: gitea.com Cloud Actions provides ubuntu-latest. The plugin
|
|
||||||
# csproj targets net10.0-windows, but `dotnet build` cross-compiles on
|
|
||||||
# Linux as long as the Dalamud staging assemblies are present at the
|
|
||||||
# expected lookup path ($(HOME)/.xlcore/dalamud/Hooks/dev/, which the
|
|
||||||
# Dalamud SDK 15 uses on Linux).
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main]
|
|
||||||
pull_request:
|
|
||||||
branches: [main]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
# Minimum permissions for a build-only workflow: read the repo, nothing
|
|
||||||
# else. Closes the CodeQL "Workflow does not contain permissions" alert
|
|
||||||
# and matches the principle-of-least-privilege the security guide
|
|
||||||
# recommends for workflows that don't push or create releases.
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
name: Build (Release)
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 15
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
|
||||||
|
|
||||||
- name: Setup .NET 10
|
|
||||||
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5
|
|
||||||
with:
|
|
||||||
dotnet-version: 10.0.x
|
|
||||||
|
|
||||||
- name: Download Dalamud staging
|
|
||||||
run: |
|
|
||||||
hooks="$HOME/.xlcore/dalamud/Hooks/dev"
|
|
||||||
mkdir -p "$hooks"
|
|
||||||
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
|
|
||||||
unzip -oq dalamud.zip -d "$hooks"
|
|
||||||
|
|
||||||
- name: Restore
|
|
||||||
run: dotnet restore HellionChat/HellionChat.csproj
|
|
||||||
|
|
||||||
- name: Build (Release)
|
|
||||||
run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
|
|
||||||
@@ -1,255 +0,0 @@
|
|||||||
name: Forge Announce
|
|
||||||
|
|
||||||
# Triggered when a vX.Y.Z tag is pushed. Reads .github/forge-posts/<tag>.md
|
|
||||||
# (Frontmatter + DE bullet body) and the matching English block from
|
|
||||||
# HellionChat/HellionChat.yaml, builds a Discord-Webhook embed and posts
|
|
||||||
# it to the Hellion Forge #changelog channel.
|
|
||||||
#
|
|
||||||
# Decoupled from release.yml: a fail here does not block the GitHub
|
|
||||||
# release, and a fail there does not block the announce. Spec lives in
|
|
||||||
# the Vault under "Hellion Chat Forge-Auto-Announce Spec".
|
|
||||||
#
|
|
||||||
# Security: the only user-controlled inputs that enter run-steps are the
|
|
||||||
# tag name and the frontmatter values from a repo-internal markdown file.
|
|
||||||
# Tag name is read via env: (TAG_NAME, $env:TAG_NAME) and validated against
|
|
||||||
# ^v\d+\.\d+\.\d+$ before any string interpolation. Frontmatter values are
|
|
||||||
# parsed by regex with explicit length caps. No webhook event payload data
|
|
||||||
# (issue titles, PR bodies, commit messages, etc.) flows into run-steps.
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
tag:
|
|
||||||
description: 'Existing tag to (re)post, e.g. v1.1.0'
|
|
||||||
required: true
|
|
||||||
type: string
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
announce:
|
|
||||||
name: Post changelog to Hellion Forge
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
# The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret
|
|
||||||
# on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
|
|
||||||
# scope for every job by default, no environment: declaration needed.
|
|
||||||
timeout-minutes: 5
|
|
||||||
|
|
||||||
steps:
|
|
||||||
# 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 yaml + forge-posts file are read from the tagged tree, not main.
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
|
||||||
with:
|
|
||||||
ref: ${{ github.event.inputs.tag || github.ref }}
|
|
||||||
|
|
||||||
# Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh)
|
|
||||||
# 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
|
|
||||||
# treat it as a string variable rather than inline shell text, and
|
|
||||||
# validated against the semver regex before any interpolation.
|
|
||||||
- name: Build embed payload
|
|
||||||
id: build
|
|
||||||
shell: pwsh
|
|
||||||
env:
|
|
||||||
TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
|
|
||||||
run: |
|
|
||||||
$tag = $env:TAG_NAME
|
|
||||||
if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
|
|
||||||
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")
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
$payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress
|
|
||||||
# Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @-
|
|
||||||
[System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false))
|
|
||||||
|
|
||||||
Write-Host "Payload size: $($payloadJson.Length) chars"
|
|
||||||
Write-Host "Embed title: $title"
|
|
||||||
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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,222 +0,0 @@
|
|||||||
name: Release
|
|
||||||
|
|
||||||
# Triggered when a vX.Y.Z tag is pushed. Builds the plugin against the
|
|
||||||
# current Dalamud staging branch, locates the latest.zip produced by
|
|
||||||
# DalamudPackager and attaches it to the matching Gitea Release.
|
|
||||||
#
|
|
||||||
# User-controlled inputs touched by this workflow:
|
|
||||||
# - the tag name (filtered by on.tags = v*, validated again at runtime
|
|
||||||
# against ^v\d+\.\d+\.\d+$ before being used in any string)
|
|
||||||
# All other values are either repo-controlled (paths under
|
|
||||||
# HellionChat/bin/Release derived from find / Get-ChildItem) or pinned
|
|
||||||
# URLs to goatcorp / gitea. Nothing from a webhook event payload (issue/PR
|
|
||||||
# titles, commit messages, etc.) flows into a run-step.
|
|
||||||
#
|
|
||||||
# Linux runner: gitea.com Cloud Actions only ships ubuntu-latest. The
|
|
||||||
# plugin csproj targets net10.0-windows, `dotnet build` cross-compiles on
|
|
||||||
# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
# 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
|
|
||||||
# ref step below hard-fails if a non-tag ref is selected: the release
|
|
||||||
# name and body are both derived from the tag, so a branch ref would
|
|
||||||
# publish a release named after a branch.
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
name: Build and attach release ZIP
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 20
|
|
||||||
|
|
||||||
steps:
|
|
||||||
# Validate up-front so a manual dispatch from a branch ref fails loud
|
|
||||||
# here instead of burning a full build before the publish step notices.
|
|
||||||
- name: Validate tag ref
|
|
||||||
run: |
|
|
||||||
if [[ "${GITHUB_REF}" != refs/tags/v* ]]; then
|
|
||||||
echo "::error::Release workflow must run on a v*.X.Y tag ref, got ${GITHUB_REF}"
|
|
||||||
echo "::error::Push a tag, or pick the tag (not main) in the workflow_dispatch Ref dropdown."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
|
||||||
|
|
||||||
- name: Setup .NET 10
|
|
||||||
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5
|
|
||||||
with:
|
|
||||||
dotnet-version: 10.0.x
|
|
||||||
|
|
||||||
- name: Download Dalamud staging
|
|
||||||
run: |
|
|
||||||
hooks="$HOME/.xlcore/dalamud/Hooks/dev"
|
|
||||||
mkdir -p "$hooks"
|
|
||||||
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
|
|
||||||
unzip -oq dalamud.zip -d "$hooks"
|
|
||||||
|
|
||||||
- name: Build (Release)
|
|
||||||
run: dotnet build HellionChat/HellionChat.csproj --configuration Release
|
|
||||||
|
|
||||||
- name: Locate latest.zip
|
|
||||||
id: locate
|
|
||||||
run: |
|
|
||||||
zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
|
|
||||||
if [ -z "$zip" ]; then
|
|
||||||
echo "latest.zip not found under HellionChat/bin/Release" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "Found: $zip"
|
|
||||||
echo "path=$zip" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
# Build a release body from the matching changelog block in
|
|
||||||
# HellionChat.yaml plus a static install / docs footer. Fails the
|
|
||||||
# workflow if no block exists for the tagged version, which is the
|
|
||||||
# automated counterpart to the "yaml + repo.json + release body
|
|
||||||
# kept in sync" rule.
|
|
||||||
#
|
|
||||||
# GITHUB_REF_NAME is read via env: (not ${{ }} interpolation) so the
|
|
||||||
# tag value is treated as a PowerShell variable, not as inline shell
|
|
||||||
# text. The strict regex below rejects anything that is not a clean
|
|
||||||
# semver tag before it is used to build a string.
|
|
||||||
- name: Generate release body
|
|
||||||
shell: pwsh
|
|
||||||
env:
|
|
||||||
# github.ref_name is the tag because Validate tag ref above
|
|
||||||
# already enforced refs/tags/v*. Read via env: so the value
|
|
||||||
# is a PowerShell variable, not inline shell text, and gets
|
|
||||||
# re-validated against the semver regex below.
|
|
||||||
TAG_NAME: ${{ github.ref_name }}
|
|
||||||
run: |
|
|
||||||
$tag = $env:TAG_NAME
|
|
||||||
if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
|
|
||||||
throw "Refusing to generate release body for non-semver tag: $tag"
|
|
||||||
}
|
|
||||||
$version = $tag.Substring(1)
|
|
||||||
|
|
||||||
$yamlPath = "HellionChat/HellionChat.yaml"
|
|
||||||
$raw = Get-Content -Path $yamlPath -Raw
|
|
||||||
|
|
||||||
$marker = "changelog: |-"
|
|
||||||
$idx = $raw.IndexOf($marker)
|
|
||||||
if ($idx -lt 0) { throw "changelog block not found in $yamlPath" }
|
|
||||||
|
|
||||||
# changelog: is the last top-level key in the manifest, so
|
|
||||||
# everything after the marker is the literal block. Strip the
|
|
||||||
# 4-space yaml indent (prettier convention) from each line.
|
|
||||||
$afterMarker = $raw.Substring($idx + $marker.Length)
|
|
||||||
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
|
|
||||||
if ($_ -match '^ ') { $_.Substring(4) } else { $_ }
|
|
||||||
}) -join "`n"
|
|
||||||
|
|
||||||
# Subblock convention: "**vX.Y.Z — <subtitle> (<date>)**"
|
|
||||||
# matches verify-changelog-sync.sh and slim-rule grep.
|
|
||||||
$header = "**v$version "
|
|
||||||
$start = $changelogBody.IndexOf($header)
|
|
||||||
if ($start -lt 0) {
|
|
||||||
throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
|
|
||||||
}
|
|
||||||
|
|
||||||
$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)) {
|
|
||||||
$currentBlock = $rest.Substring(0, $nextHdr).TrimEnd()
|
|
||||||
} elseif ($trailer -ge 0) {
|
|
||||||
$currentBlock = $rest.Substring(0, $trailer).TrimEnd()
|
|
||||||
} else {
|
|
||||||
$currentBlock = $rest.TrimEnd()
|
|
||||||
}
|
|
||||||
|
|
||||||
# Static install / docs / licence footer is maintained as a
|
|
||||||
# separate file so the workflow YAML stays clean (no embedded
|
|
||||||
# heredoc that would have to be indented under the run-block).
|
|
||||||
$footerPath = ".github/release-footer.md"
|
|
||||||
if (-not (Test-Path $footerPath)) {
|
|
||||||
throw "Release footer template not found: $footerPath"
|
|
||||||
}
|
|
||||||
$footer = Get-Content -Path $footerPath -Raw
|
|
||||||
|
|
||||||
$body = $currentBlock + "`n" + $footer
|
|
||||||
$body | Out-File -FilePath release-body.md -Encoding utf8 -NoNewline
|
|
||||||
|
|
||||||
Write-Host "Generated release body for $tag :"
|
|
||||||
Write-Host "----------------------------------------"
|
|
||||||
Write-Host $body
|
|
||||||
Write-Host "----------------------------------------"
|
|
||||||
|
|
||||||
# The tag comes from GITHUB_REF, the body from the step above. Posted with
|
|
||||||
# curl rather than gitea.com/actions/release-action, which declares
|
|
||||||
# `using: go` and has to be compiled by the runner -- act cannot do that
|
|
||||||
# here and the step dies with exec: "go": executable file not found, exit
|
|
||||||
# 127, after a build that otherwise succeeded. This runs as a plain shell
|
|
||||||
# step in the job image, which has curl and python3.
|
|
||||||
#
|
|
||||||
# Idempotent on purpose: a re-run against an existing release reuses it and
|
|
||||||
# replaces the asset instead of failing on the duplicate.
|
|
||||||
- name: Attach to Gitea release
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
ZIP_PATH: ${{ steps.locate.outputs.path }}
|
|
||||||
TAG_NAME: ${{ github.ref_name }}
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}"
|
|
||||||
auth="Authorization: token ${GITEA_TOKEN}"
|
|
||||||
|
|
||||||
# Responses land in a file before anything reads them, rather than
|
|
||||||
# being piped straight into an interpreter. The interpreter is inline
|
|
||||||
# either way and the server only ever supplies data, but a scanner
|
|
||||||
# cannot tell those apart from curl-pipe-shell -- and holding the
|
|
||||||
# response makes it inspectable when a call misbehaves.
|
|
||||||
get_release_id() {
|
|
||||||
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 interpoliert SQL-Strings, die plugin-lokal sicher sind;
|
# MessageStore.cs uses string-interpolation in CommandText for table
|
||||||
# Semgrep matcht das Pattern, CodeQL mit Datenflussanalyse nicht.
|
# names and clause-joins that come from internal code constants, not
|
||||||
semgrep-exclude-rules: 'csharp.lang.security.sqli.csharp-sqli.csharp-sqli'
|
# user input. Values are bound via SqlParameter, the SQL surface is
|
||||||
|
# local-only inside a Dalamud plugin. Semgrep matches the pattern
|
||||||
|
# without dataflow, so it flags those eight call sites; CodeQL
|
||||||
|
# would not. Suppressed for this repo only.
|
||||||
|
semgrep-exclude-rules: "csharp.lang.security.sqli.csharp-sqli.csharp-sqli"
|
||||||
|
|||||||
@@ -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,55 +1,57 @@
|
|||||||
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,8 +18,7 @@ mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
|
|||||||
|
|
||||||
- [ ] Bug fix (non-breaking change that fixes an issue)
|
- [ ] Bug fix (non-breaking change that fixes an issue)
|
||||||
- [ ] New feature (non-breaking change that adds behaviour)
|
- [ ] New feature (non-breaking change that adds behaviour)
|
||||||
- [ ] Breaking change (config migration, removed feature, or behaviour change that user-visible
|
- [ ] Breaking change (config migration, removed feature, or behaviour change that user-visible defaults rely on)
|
||||||
defaults rely on)
|
|
||||||
- [ ] Documentation only
|
- [ ] Documentation only
|
||||||
- [ ] Translation update
|
- [ ] Translation update
|
||||||
- [ ] Build, CI or tooling change
|
- [ ] Build, CI or tooling change
|
||||||
@@ -56,11 +55,10 @@ new commands, new translations, removed behaviour. If none, write
|
|||||||
|
|
||||||
## Checklist
|
## Checklist
|
||||||
|
|
||||||
- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and
|
- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
|
||||||
[CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
|
|
||||||
- [ ] My change matches the existing code style (`.editorconfig`).
|
- [ ] My change matches the existing code style (`.editorconfig`).
|
||||||
- [ ] I added or updated tests where the existing test infrastructure made that practical, or I have
|
- [ ] I added or updated tests where the existing test infrastructure made that practical, or I have explained why tests
|
||||||
explained why tests are not applicable.
|
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,16 +3,15 @@ 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,
|
- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint
|
||||||
Moonlit Bloom, Mint Grove
|
Grove
|
||||||
- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View,
|
- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC
|
||||||
Breadcrumb und ESC zurück zur Übersicht
|
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
|
- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch
|
||||||
Start automatisch abgelegt
|
abgelegt
|
||||||
- Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch
|
- Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben
|
||||||
ü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
|
- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings
|
||||||
Klassik in Settings → Themes
|
→ 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
|
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den
|
||||||
Akzent-Pill markiert den aktiven Tab
|
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
|
(envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher
|
||||||
Kombinationen, gleicher Partner ergibt konsistent dieselbe
|
Partner ergibt konsistent dieselbe
|
||||||
- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft,
|
- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle,
|
||||||
2-Sekunden-Cycle, deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
|
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,
|
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter,
|
||||||
Tab/Message-Counter, Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
|
Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
|
||||||
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter
|
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner.
|
||||||
Trenner. `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
|
`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
|
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante
|
||||||
Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert.
|
Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben
|
||||||
Persistente und Auto-Tell-Tabs überleben beide
|
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,31 +3,27 @@ subtitle: "Settings Cleanup"
|
|||||||
versionsnatur: "UX-Polish-Cycle"
|
versionsnatur: "UX-Polish-Cycle"
|
||||||
---
|
---
|
||||||
|
|
||||||
- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede
|
- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen
|
||||||
Card hat einen kurzen Untertitel — kein Raten mehr wo eine Setting steckt
|
Untertitel — kein Raten mehr wo eine Setting steckt
|
||||||
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften
|
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben**
|
||||||
& Farben** (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung**
|
(Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer,
|
||||||
(Aufbewahrung, Cleanup, Export, DB-Viewer, Advanced-Tools — vorher zwischen Datenschutz und
|
Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
|
||||||
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):
|
- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle,
|
||||||
`Stilüberschreiben`-Toggle, `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes
|
`Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
|
||||||
`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
|
`Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst
|
||||||
Default 0.85 stand, sonst gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter
|
gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User
|
||||||
`pluginConfigs/HellionChat.json.pre-v16-backup`. User die `Stilüberschreiben` aktiv hatten sehen
|
die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
|
||||||
einen einmaligen Hinweis-Toast
|
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig
|
||||||
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+
|
hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
|
||||||
standardmäßig hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf
|
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine
|
||||||
konservativere 2500
|
Preset-Wahl)
|
||||||
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der
|
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der
|
||||||
First-Run-Wizard hat keine Preset-Wahl)
|
Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über
|
||||||
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü
|
unseren Slider für das jeweilige Fenster
|
||||||
(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,
|
Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker)
|
||||||
Theme-Crossfade, Quick-Picker) wie ursprünglich geplant.
|
wie ursprünglich geplant.
|
||||||
|
|||||||
@@ -3,23 +3,21 @@ 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
|
- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach
|
||||||
angefasst, einfach mehr Farboptionen
|
mehr Farboptionen
|
||||||
- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral
|
- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich
|
||||||
gehalten damit es sich nicht mit den Brand-Themes beißt
|
nicht mit den Brand-Themes beißt
|
||||||
- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für
|
- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von
|
||||||
Aurora-Glitter-Stimmung. Schwester von Event Horizon, aber dunkler und dichter; der Türkis-Akzent
|
Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
|
||||||
hält die beiden klar auseinander
|
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein
|
||||||
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion
|
eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
|
||||||
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,
|
Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün);
|
||||||
Party blau, FC grün); die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche
|
die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller
|
||||||
klar trennbar bleibt. Deckt rund 99 % aller CVD-Fälle ab
|
CVD-Fälle ab
|
||||||
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene
|
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen
|
||||||
Custom-Themes laufen unverändert weiter
|
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
|
Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche)
|
||||||
Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt.
|
kann später nachgeliefert werden, falls Bedarf kommt.
|
||||||
|
|||||||
@@ -4,17 +4,15 @@ 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
|
- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem
|
||||||
jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht
|
Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel
|
||||||
installiert ist oder kein Custom-Titel aktiv ist
|
aktiv ist
|
||||||
- **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der
|
- **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss
|
||||||
User raten muss
|
- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus
|
||||||
- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert,
|
Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications
|
||||||
inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt:
|
(NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button
|
||||||
Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und
|
(XIVInstantMessenger)
|
||||||
LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger)
|
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus
|
||||||
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum
|
Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
|
||||||
Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen
|
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald
|
||||||
Integrationen
|
HellionChat aktualisiert
|
||||||
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel
|
|
||||||
automatisch sobald HellionChat aktualisiert
|
|
||||||
|
|||||||
@@ -5,20 +5,19 @@ versionsnatur: Stability-Hotfix
|
|||||||
|
|
||||||
**Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
|
**Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
|
||||||
|
|
||||||
Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den
|
Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
|
||||||
Audit-Pässen abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
|
abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
|
||||||
|
|
||||||
- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der
|
- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der Connection macht den
|
||||||
Connection macht den manuellen GC.Collect überflüssig
|
manuellen GC.Collect überflüssig
|
||||||
- **Worker-Threads** (PendingMessage, RetentionSweep) sind jetzt explizit IsBackground=true, das
|
- **Worker-Threads** (PendingMessage, RetentionSweep) sind jetzt explizit IsBackground=true, das Plugin-Domain kann
|
||||||
Plugin-Domain kann sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
|
sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
|
||||||
- **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose.
|
- **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
|
||||||
Kein Schreib-Risiko mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
|
mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
|
||||||
- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
|
- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
|
||||||
- **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden,
|
- **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden, Settings-Änderungen aus den letzten
|
||||||
Settings-Änderungen aus den letzten Frames vor Disable überleben jetzt zuverlässig
|
Frames vor Disable überleben jetzt zuverlässig
|
||||||
- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das
|
- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das neue
|
||||||
neue WindowOpacity-Feld statt auf 0.85 zurückzufallen
|
WindowOpacity-Feld statt auf 0.85 zurückzufallen
|
||||||
|
|
||||||
Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown
|
Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown spürbar sauberer laufen.
|
||||||
spürbar sauberer laufen.
|
|
||||||
|
|||||||
@@ -5,25 +5,23 @@ versionsnatur: Performance-Patch
|
|||||||
|
|
||||||
**Hellion Chat 1.4.1 — Theme Engine Performance**
|
**Hellion Chat 1.4.1 — Theme Engine Performance**
|
||||||
|
|
||||||
Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure aus dem Theme-Engine-Render-Pfad
|
Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure aus dem Theme-Engine-Render-Pfad eliminiert,
|
||||||
eliminiert, Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter
|
Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter Built-In und überarbeitete
|
||||||
Built-In und überarbeitete Author-Credits.
|
Author-Credits.
|
||||||
|
|
||||||
- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle
|
- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle Color-Slots einmalig in
|
||||||
Color-Slots einmalig in ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal liest aus dem
|
ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal liest aus dem Cache statt pro Slot pro Frame durch
|
||||||
Cache statt pro Slot pro Frame durch ColourUtil.RgbaToAbgr zu jagen. Real gemessene
|
ColourUtil.RgbaToAbgr zu jagen. Real gemessene Frame-Time-Recovery: **~13 %** in typischer Render-Szene
|
||||||
Frame-Time-Recovery: **~13 %** in typischer Render-Szene (Plan-Erwartung war 2-6 % konservativ,
|
(Plan-Erwartung war 2-6 % konservativ, real ~10-15 %)
|
||||||
real ~10-15 %)
|
- **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während HellionChat reloaden will,
|
||||||
- **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während
|
fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im Picker,
|
||||||
HellionChat reloaden will, fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation
|
beim nächsten Tick wird automatisch retry'd — vorher fiel das Theme aus der Liste bis zum Plugin-Reload
|
||||||
ab. Last-Known-Good-Snapshot bleibt im Picker, beim nächsten Tick wird automatisch retry'd —
|
- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
|
||||||
vorher fiel das Theme aus der Liste bis zum Plugin-Reload
|
gekommen ist, holt Switch() das beim Anwenden nach
|
||||||
- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne
|
- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
|
||||||
Cache-Fill in den Speicher gekommen ist, holt Switch() das beim Anwenden nach
|
Late-Night-Raids
|
||||||
- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett,
|
- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt unter „Hellion Forge". Mint Grove und Forge Merchantman
|
||||||
80s-Neon-Grid-Vibes für Late-Night-Raids
|
werden Carla Beleandis als Community-Geste zugeschrieben.
|
||||||
- **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
|
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames in Theme-getrieben rendernden
|
||||||
Theme-getrieben rendernden Szenen merklich glatter laufen und ein neues Theme im Picker steht.
|
Szenen merklich glatter laufen und ein neues Theme im Picker steht.
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
---
|
|
||||||
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,27 +5,25 @@ versionsnatur: Performance-Patch
|
|||||||
|
|
||||||
**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
|
**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
|
||||||
|
|
||||||
Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Per-Frame-Allokations-Quellen aus dem
|
Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render- Pfad
|
||||||
ChatLogWindow-Render- Pfad und der Settings-StatusBar eliminiert.
|
und der Settings-StatusBar eliminiert.
|
||||||
|
|
||||||
- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right
|
- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right und die ABGR-
|
||||||
und die ABGR- Border-Color einmalig vor den Per-Message-Loop. Bei 100 sichtbaren Messages sind das
|
Border-Color einmalig vor den Per-Message-Loop. Bei 100 sichtbaren Messages sind das gut 500 redundante P/Invokes und
|
||||||
gut 500 redundante P/Invokes und Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups
|
Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups (mehrere parallele Chat-Windows) profitieren
|
||||||
(mehrere parallele Chat-Windows) profitieren proportional, weil der Hoist pro DrawMessages-Call
|
proportional, weil der Hoist pro DrawMessages-Call greift, also pro Window
|
||||||
greift, also pro Window
|
- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit
|
||||||
- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro
|
zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der neue TabTintCache liest pre-computed
|
||||||
Tab pro Frame, mit zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der
|
Werte aus dem Tab und rechnet nur neu wenn das Tell-Target drifted. Beide Caches haben separate Validation-Keys, also
|
||||||
neue TabTintCache liest pre-computed Werte aus dem Tab und rechnet nur neu wenn das Tell-Target
|
keine Cross-Invalidation zwischen Tint- und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne
|
||||||
drifted. Beide Caches haben separate Validation-Keys, also keine Cross-Invalidation zwischen Tint-
|
Tab-Awareness
|
||||||
und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne Tab-Awareness
|
- **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert die Tab-Message-
|
||||||
- **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert
|
Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
|
||||||
die Tab-Message- Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag
|
liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
|
||||||
bisher hinter den LINQ-Pfaden, also liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate,
|
ersetzt. Die Aggregation läuft auf etwa 1 % der Frames
|
||||||
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
|
Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
|
||||||
durch die Card-Border- Multiplikation pro Window.
|
Multiplikation pro Window.
|
||||||
|
|
||||||
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log
|
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log und in der
|
||||||
und in der Settings-Statusleiste merklich glatter laufen.
|
Settings-Statusleiste merklich glatter laufen.
|
||||||
|
|||||||
@@ -5,29 +5,25 @@ versionsnatur: Architecture-Refactor
|
|||||||
|
|
||||||
**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover**
|
**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover**
|
||||||
|
|
||||||
Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Lifecycle auf Dalamud's
|
Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert und
|
||||||
`IAsyncDalamudPlugin`-API migriert und das Custom-Repo zieht von GitHub auf Gitea um.
|
das Custom-Repo zieht von GitHub auf Gitea um.
|
||||||
|
|
||||||
- **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials
|
- **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials (Config-Load, Language-Init,
|
||||||
(Config-Load, Language-Init, Conflict-Detection). Migrationen, Service-Allokationen,
|
Conflict-Detection). Migrationen, Service-Allokationen, Window-Konstruktion und Hook-Subscription wandern in
|
||||||
Window-Konstruktion und Hook-Subscription wandern in LoadAsync, sodass Dalamud die UI während der
|
LoadAsync, sodass Dalamud die UI während der schweren Arbeit responsive halten kann. Per-Line-CaptureFailure in
|
||||||
schweren Arbeit responsive halten kann. Per-Line-CaptureFailure in DisposeAsync mirrort
|
DisposeAsync mirrort LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
|
||||||
LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
|
- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die Custom-Repo-URL auf
|
||||||
- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die
|
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json` umstellen, dann
|
||||||
Custom-Repo-URL auf
|
XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot stehen und wird nicht mehr
|
||||||
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
|
aktualisiert
|
||||||
umstellen, dann XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener
|
- **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen harten Schema-Check in
|
||||||
v1.4.2-Snapshot stehen und wird nicht mehr aktualisiert
|
Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1) bekommen jetzt eine klare „install v1.4.2
|
||||||
- **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen
|
first"-Fehlermeldung statt eines impliziten Migrations-Pfads
|
||||||
harten Schema-Check in Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1)
|
- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt blockierend im
|
||||||
bekommen jetzt eine klare „install v1.4.2 first"-Fehlermeldung statt eines impliziten
|
Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen kurzen Hitch haben, dafür kein
|
||||||
Migrations-Pfads
|
300-ms-Block beim Plugin-Start
|
||||||
- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt
|
- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf Reloads, vergleichbar mit v1.4.2. Der Async-Refactor ist
|
||||||
blockierend im Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen
|
Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) und Code-Architektur-Hygiene, kein direkter User-spürbarer
|
||||||
kurzen Hitch haben, dafür kein 300-ms-Block beim Plugin-Start
|
Speed-Win in dieser Release
|
||||||
- **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
|
Keine User-sichtbaren Funktions-Änderungen außer dem Repo-URL-Update. Settings, Themes und Tabs bleiben unangetastet.
|
||||||
bleiben unangetastet.
|
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
---
|
|
||||||
subtitle: Threading- und IPC-Sicherheits-Politur
|
|
||||||
versionsnatur: Wartung und Robustheit
|
|
||||||
---
|
|
||||||
|
|
||||||
**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 Hot-Path-Lock im Auto-Tell-Tab-Counter fällt weg, IPC-Cleanup wird sichtbar wenn
|
|
||||||
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 einem Lock gemacht. Jetzt läuft das über einen Interlocked-Counter der
|
|
||||||
parallel zur Tabs-Liste mitgeführt wird, inklusive Resync-Hook für den Snapshot-Restore-Pfad in
|
|
||||||
`SaveConfig`. Plus Pure-Helper-Test-Mirror in der Build-Suite damit die Atomicity-Semantik nicht
|
|
||||||
versehentlich wegrefactored wird
|
|
||||||
- **HonorificService selbst-dokumentierende Threading-Banner.** Statt eines Block-Comments am
|
|
||||||
Klassen-Ende hat jede IPC-Callback-Methode jetzt einen 1-Zeilen-Banner darüber, der den
|
|
||||||
Thread-Kontext direkt am Call-Site benennt (framework only, framework scheduled, any). Mehr Hilfe
|
|
||||||
für künftige Reviews als ein abstraktes Threading-Kapitel
|
|
||||||
- **Unsubscribe-Failure ist jetzt sichtbar.** `TryUnsubscribe` hat ein Honorific-Unsubscribe-Failure
|
|
||||||
bisher als Debug geloggt, was bei Standard-Loglevel verschluckt wurde. Eine geleakte Subscription
|
|
||||||
kann den Service über Plugin-Reloads hinweg leben lassen, also läuft der Log jetzt auf Warning
|
|
||||||
- **AutoTranslate-Warmup blockiert den Plugin-Unload nicht mehr.** Der Cache-Warmup-Thread war ohne
|
|
||||||
`IsBackground=true` unterwegs, was den Unload um 100-300 ms verzögern konnte. Pattern-Match zu
|
|
||||||
MessageManager und RetentionSweep (beide seit v1.4.0)
|
|
||||||
- **Privacy-Filter loggt unbekannte ChatTypes.** Wenn FFXIV durch einen Patch einen neuen ChatType
|
|
||||||
einführt der weder in der Whitelist noch in den Defaults steht, wird er bisher silent durch den
|
|
||||||
Failsafe geleitet. Jetzt loggt der Filter einmalig pro Runtime eine Warning mit dem Type und dem
|
|
||||||
Failsafe-Wert. Dedup über ein NonSerialized-HashSet, also kein Log-Spam
|
|
||||||
- **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 das Privacy-Verhalten für Bestand bleiben unangetastet.
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
---
|
|
||||||
subtitle: UX und Robustheit
|
|
||||||
versionsnatur: UX-Polish-Cycle
|
|
||||||
---
|
|
||||||
|
|
||||||
**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 First-Run-Wizard hat eine explizite Cancel-Schaltfläche, der Eingabe-Verlauf bleibt
|
|
||||||
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 eine einmalige Warning-Notification mit Verweis aufs `/xllog`, statt das
|
|
||||||
Fenster stillschweigend leer zu lassen. Der Stack-Trace selbst geht weiter via `Plugin.Log.Error`
|
|
||||||
ins Logfile. De-Dup über Per-Session-Bool, damit ein wiederkehrender Fehler die Notification-Stack
|
|
||||||
nicht pro Frame neu vollkippt
|
|
||||||
- **First-Run-Wizard trennt Accept und Close.** `OnClose` setzt nicht mehr stillschweigend
|
|
||||||
`FirstRunCompleted=true`, also lässt das X den Wizard schwebend zurück und er kommt beim nächsten
|
|
||||||
Plugin-Reload wieder. Eine neue „Später — Defaults behalten"-Schaltfläche im Footer ist der
|
|
||||||
explizite Weg, ohne Profil-Auswahl rauszukommen. Strings bilingual EN+DE plus Tooltip
|
|
||||||
- **Eingabe-Verlauf wird beim Plugin-Reload geleert.** `InputHistoryService.Reset` hängt jetzt in
|
|
||||||
`Plugin.DisposeAsync` neben den anderen Pure-Memory-Cleanups, damit der statische Zustand aus der
|
|
||||||
vorigen Session den nächsten Load nicht mehr erbt
|
|
||||||
- **Statusleiste klippt nicht mehr.** Der rechtsbündige Versions-Slot wird ausgeblendet wenn die
|
|
||||||
Chat-Window-Breite abzüglich Versions-Text unter 200 px fällt — vorher überlappte er die vier
|
|
||||||
linken Slots. Ab ausreichender Breite taucht der Slot wieder auf
|
|
||||||
- **Intern:** `FontManager` fällt auf System-Font zurück wenn die eingebettete Hellion-Font-Resource
|
|
||||||
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
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
---
|
|
||||||
subtitle: Code Hygiene and Refactor
|
|
||||||
versionsnatur: Maintenance-Cycle
|
|
||||||
---
|
|
||||||
|
|
||||||
Wartungs-Patch ohne User-sichtbare Änderungen. Saubere Code-Basis als Vorbereitung auf das
|
|
||||||
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, statt erst beim Pre-Merge-Review aufzufallen.
|
|
||||||
- **FontManager-Fallback robuster**: Atlas-Toolkit-Throws aus kaputten Font-Configs (IO,
|
|
||||||
InvalidOperation, ArgumentException) fallen jetzt zuverlässig auf NotoSansCjkRegular, statt den
|
|
||||||
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 `[ModuleInitializer]` geprüft. Ein Tippfehler bei einer künftigen URL-Rotation wirft jetzt
|
|
||||||
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 freigegeben, wenn der Linkshell-Check den Channel ablehnt (vorher gefangen im
|
|
||||||
early-return).
|
|
||||||
- **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
|
|
||||||
`ImGuiHelpers.GlobalScale` und rundet die DrawList-Koordinaten auf physische Pixel. Kein
|
|
||||||
Sub-Pixel-Blur mehr auf 125/150%-Setups.
|
|
||||||
- **IconButton-Width-Fix**: der manuelle `width - 2 * CellPadding.X`-Subtract verlor den HUD-Scale
|
|
||||||
(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 `IPlatformUtil`-Indirektion. MessageStores `IsWine`-Probe ist isoliert testbar in der
|
|
||||||
Build-Suite. Plus: HellionStyle-ChildBgAlpha als Pure-Helper extrahiert, Plugin.SaveConfig kopiert
|
|
||||||
nur Session-Tabs statt der ganzen Tab-Liste, SettingsOverview cached den DrawList einmal pro
|
|
||||||
Frame.
|
|
||||||
- **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).
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
---
|
|
||||||
subtitle: Backlog Cleanup and Mid-Features
|
|
||||||
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 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 Plugin-Reload und Char-Logout, behalten ihre Konversations-Historie
|
|
||||||
(wird beim Rehydrate aus dem MessageStore nachgeladen) und bleiben an die gleiche /tell-Person
|
|
||||||
gebunden. Hard-Cap 5 angepinnte Tabs in einem separaten Pool — die normalen Auto-Tell-Tabs (15er
|
|
||||||
Cap) sind davon entkoppelt, Gesamt-Decke 20. Die Sidebar gruppiert angepinnte Tabs in einer
|
|
||||||
eigenen „Angepinnt"-Sektion mit eigenem Trenner.
|
|
||||||
- **Honorific Glow-Outline**: rendert jetzt eine 8-Richtungs-DrawList-Outline wenn der
|
|
||||||
Honorific-Titel eine Glow-Farbe trägt. Opt-in via **Settings → Integrationen → Glow-Outline
|
|
||||||
rendern (Honorific)** (Default OFF). Gradient (Color3 / GradientColourSet / Wave / Pulse) wird
|
|
||||||
geparst und im DTO weitergereicht, rendert aktuell aber statisch als Primärfarbe — der volle
|
|
||||||
Gradient-Port (Animations-Algorithmus + Pride-Palette) kommt als eigener Cycle nach.
|
|
||||||
- **Sidebar-Breite konfigurierbar**: in **Theme & Layout** ein Slider 44–160 px. Default bleibt 44
|
|
||||||
px (icon-only), aber breiter machen damit Sektion-Header wie „Aktive Tells (3)" oder „Angepinnt
|
|
||||||
(2)" nicht abgeschnitten werden.
|
|
||||||
- **Settings-Save Channel-Fix**: ein Save mit aktivem Party- oder Linkshell-Tab konnte den
|
|
||||||
Chat-Input zurück auf `/tell <angepinnte Person>` springen lassen. `Configuration.UpdateFrom`
|
|
||||||
bewahrt jetzt den Runtime-`CurrentChannel` über den persistent-Tab-Merge hinweg, und `TabSwitched`
|
|
||||||
deep-cloned den Seed-Channel statt sich den `UsedChannel` mit dem vorigen Tab zu teilen.
|
|
||||||
- **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).
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
---
|
|
||||||
subtitle: Hook-Layer und Polish-Quick-Wins
|
|
||||||
versionsnatur: Polish-Patch
|
|
||||||
---
|
|
||||||
|
|
||||||
- DbViewer Volltext-Suche: optionaler FTS5-Index über die ganze Chat-Historie. Wird beim ersten
|
|
||||||
v1.4.8-Start asynchron im Hintergrund gebaut, Progress als Toast. Lokale Page-Suche bleibt
|
|
||||||
Default. Such-Eingaben werden als exakte Wortfolge gematcht; mehrere Wörter werden nur gefunden,
|
|
||||||
wenn sie zusammen und in der Reihenfolge stehen. Wer rohe FTS5-MATCH-Syntax nutzen will, setzt
|
|
||||||
eigene Anführungszeichen um den Suchbegriff.
|
|
||||||
- Custom-Theme-Files laden sich beim Speichern automatisch neu, wenn das Theme aktiv ist. Kein
|
|
||||||
Picker-Klick mehr nötig.
|
|
||||||
- Retention-Sweep blockt nicht mehr den Framework-Thread. Der Mini-Hitch von ~194ms pro Sweep ist
|
|
||||||
weg.
|
|
||||||
- Statusleiste rendert sauber bei Windows-Skalierung über 100%.
|
|
||||||
- Receive-Suppressed-Tells-Routing wurde in diesem Cycle untersucht und auf v1.5.x verschoben: wenn
|
|
||||||
andere Plugins Tells via CheckMessageHandled unterdrücken, überspringt FFXIVs Chat-Pipeline den
|
|
||||||
RaptureLogModule-Resolver und HellionChats Tab-Routing verliert den Tell-Partner. Der Fix liegt
|
|
||||||
architektonisch neben dem geplanten Ad-Block-Hook-Layer und kommt dort mit.
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
---
|
|
||||||
subtitle: Plugin-Load Render Polish
|
|
||||||
versionsnatur: Performance-Patch
|
|
||||||
---
|
|
||||||
|
|
||||||
- First-Frame-HITCH unter 100 ms: der erste Render-Frame des Plugins liegt jetzt bei ~76 ms Median
|
|
||||||
(vorher ~127 ms), die Dalamud-Warnung „UiBuilder(Hellion Chat) > 100ms" beim Plugin-Start ist
|
|
||||||
damit weg. Erreicht durch das Verlagern von sechs nicht-essentiellen Render- Sektionen
|
|
||||||
(Statusleiste, Kanalname-Chunks, Fenster-Bounds-Check, Hinweis-Banner, Autocomplete,
|
|
||||||
Input-Preview) auf den zweiten Frame. Bei 60 fps sieht man die deferred-Sektionen ~17 ms später,
|
|
||||||
was im Atlas-Build-Fenster nach einem Reload unsichtbar bleibt.
|
|
||||||
- Slash-Commands zentral registriert: /hellion, /hellionView, /hellionSeString und /hellionDebugger
|
|
||||||
werden jetzt im Plugin-Load zentral registriert statt erst beim ersten Öffnen ihres Ziel-Fensters.
|
|
||||||
Heißt: die Befehle funktionieren ab dem ersten Tick, auch wenn das jeweilige Fenster nie geöffnet
|
|
||||||
wurde. Der „Einstellungen"-Button im Plugin-Manager hängt am selben Pfad.
|
|
||||||
- Plugin-Load-Diagnose-Logs als Tripwire: die Profiling-Logs für MessageStore.Connect,
|
|
||||||
MessageStore.Migrate, FilterAllTabs und den Auto-Translate-Warmup bleiben auf Information-Level
|
|
||||||
eingeschaltet. Falls eine zukünftige Änderung die Lade-Zeit wieder über 100 ms drückt, taucht der
|
|
||||||
Mehrverbrauch direkt im /xllog auf, ohne dass jemand erst den Debug-Filter einschalten muss.
|
|
||||||
- ChatTwo-IPC-Kompatibilitäts-Layer: HellionChat spiegelt jetzt die komplette ChatTwo-IPC-Surface
|
|
||||||
(`GetChatInputState`, `ChatInputStateChanged`, `Register`, `Unregister`, `Available`, `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.
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
---
|
|
||||||
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.
|
|
||||||
+12
-14
@@ -2,28 +2,26 @@
|
|||||||
|
|
||||||
## How to install
|
## How to install
|
||||||
|
|
||||||
This release is distributed via the HellionChat custom repository, not the Dalamud main plugin repo.
|
This release is distributed via the HellionChat custom repository, not the Dalamud main plugin repo. To install:
|
||||||
To install:
|
|
||||||
|
|
||||||
1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories**
|
1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories**
|
||||||
2. Add the URL:
|
2. Add the URL: `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
|
||||||
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
|
|
||||||
3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install
|
3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install
|
||||||
|
|
||||||
## Project documents
|
## Project documents
|
||||||
|
|
||||||
- [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md)
|
- [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features,
|
||||||
— features, architecture, build
|
architecture, build
|
||||||
- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md)
|
- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what
|
||||||
— what the plugin stores and sends
|
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)
|
- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md) — bug reports,
|
||||||
— bug reports, questions, contact paths
|
questions, contact paths
|
||||||
|
|
||||||
## Licence
|
## Licence
|
||||||
|
|
||||||
[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE).
|
[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE). Based on
|
||||||
Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.
|
[Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
name: Build
|
||||||
|
|
||||||
|
# Verifies that every push to main and every PR still builds against the
|
||||||
|
# current Dalamud staging branch. Does not produce release artefacts; the
|
||||||
|
# release workflow handles that on tag.
|
||||||
|
#
|
||||||
|
# Linux runner: gitea.com Cloud Actions provides ubuntu-latest. The plugin
|
||||||
|
# csproj targets net10.0-windows, but `dotnet build` cross-compiles on
|
||||||
|
# Linux as long as the Dalamud staging assemblies are present at the
|
||||||
|
# expected lookup path ($(HOME)/.xlcore/dalamud/Hooks/dev/, which the
|
||||||
|
# Dalamud SDK 15 uses on Linux).
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
# Minimum permissions for a build-only workflow: read the repo, nothing
|
||||||
|
# else. Closes the CodeQL "Workflow does not contain permissions" alert
|
||||||
|
# and matches the principle-of-least-privilege the security guide
|
||||||
|
# recommends for workflows that don't push or create releases.
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: Build (Release)
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 15
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||||
|
|
||||||
|
- name: Setup .NET 10
|
||||||
|
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
|
||||||
|
with:
|
||||||
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
|
- name: Download Dalamud staging
|
||||||
|
run: |
|
||||||
|
hooks="$HOME/.xlcore/dalamud/Hooks/dev"
|
||||||
|
mkdir -p "$hooks"
|
||||||
|
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
|
||||||
|
unzip -oq dalamud.zip -d "$hooks"
|
||||||
|
|
||||||
|
- name: Restore
|
||||||
|
run: dotnet restore HellionChat/HellionChat.csproj
|
||||||
|
|
||||||
|
- name: Build (Release)
|
||||||
|
run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
name: Forge Announce
|
||||||
|
|
||||||
|
# Triggered when a vX.Y.Z tag is pushed. Reads .github/forge-posts/<tag>.md
|
||||||
|
# (Frontmatter + DE bullet body) and the matching English block from
|
||||||
|
# HellionChat/HellionChat.yaml, builds a Discord-Webhook embed and posts
|
||||||
|
# it to the Hellion Forge #changelog channel.
|
||||||
|
#
|
||||||
|
# Decoupled from release.yml: a fail here does not block the GitHub
|
||||||
|
# release, and a fail there does not block the announce. Spec lives in
|
||||||
|
# the Vault under "Hellion Chat Forge-Auto-Announce Spec".
|
||||||
|
#
|
||||||
|
# Security: the only user-controlled inputs that enter run-steps are the
|
||||||
|
# tag name and the frontmatter values from a repo-internal markdown file.
|
||||||
|
# Tag name is read via env: (TAG_NAME, $env:TAG_NAME) and validated against
|
||||||
|
# ^v\d+\.\d+\.\d+$ before any string interpolation. Frontmatter values are
|
||||||
|
# parsed by regex with explicit length caps. No webhook event payload data
|
||||||
|
# (issue titles, PR bodies, commit messages, etc.) flows into run-steps.
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v*"
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
tag:
|
||||||
|
description: "Existing tag to (re)post, e.g. v1.1.0"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
announce:
|
||||||
|
name: Post changelog to Hellion Forge
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
# The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret
|
||||||
|
# on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
|
||||||
|
# scope for every job by default, no environment: declaration needed.
|
||||||
|
timeout-minutes: 5
|
||||||
|
|
||||||
|
steps:
|
||||||
|
# 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 yaml + forge-posts file are read from the tagged tree, not main.
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||||
|
with:
|
||||||
|
ref: ${{ github.event.inputs.tag || github.ref }}
|
||||||
|
|
||||||
|
# Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh)
|
||||||
|
# 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
|
||||||
|
# treat it as a string variable rather than inline shell text, and
|
||||||
|
# validated against the semver regex before any interpolation.
|
||||||
|
- name: Build embed payload
|
||||||
|
id: build
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
|
||||||
|
run: |
|
||||||
|
$tag = $env:TAG_NAME
|
||||||
|
if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
|
||||||
|
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(2) } else { $_ }
|
||||||
|
}) -join "`n"
|
||||||
|
|
||||||
|
$header = "**Hellion Chat $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**Hellion Chat ", 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()
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------- Char-Cap-Check (5500 Total auf title + description + footer) ----------
|
||||||
|
$title = "Hellion Chat $version — $subtitle"
|
||||||
|
$description = "**Deutsch**`n`n$deBody`n`n**English**`n`n$enBlock"
|
||||||
|
$footerText = "Hellion Forge · $versionsnatur"
|
||||||
|
$totalChars = $title.Length + $description.Length + $footerText.Length
|
||||||
|
if ($totalChars -gt 5500) {
|
||||||
|
throw "V6: Total char count $totalChars exceeds 5500 limit. Major-Release detected — please post manually via Bot/Multi-Embed (see forge style §8). Forge-Auto-Announce stays off for this tag."
|
||||||
|
}
|
||||||
|
Write-Host "Char-Cap OK: $totalChars / 5500"
|
||||||
|
|
||||||
|
# ---------- Embed-Payload bauen ----------
|
||||||
|
$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 = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
|
||||||
|
color = 12730636
|
||||||
|
description = $description
|
||||||
|
footer = [ordered]@{ text = $footerText }
|
||||||
|
timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
$payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress
|
||||||
|
# Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @-
|
||||||
|
[System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false))
|
||||||
|
|
||||||
|
Write-Host "Payload size: $($payloadJson.Length) chars"
|
||||||
|
Write-Host "Embed title: $title"
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,170 @@
|
|||||||
|
name: Release
|
||||||
|
|
||||||
|
# Triggered when a vX.Y.Z tag is pushed. Builds the plugin against the
|
||||||
|
# current Dalamud staging branch, locates the latest.zip produced by
|
||||||
|
# DalamudPackager and attaches it to the matching Gitea Release.
|
||||||
|
#
|
||||||
|
# User-controlled inputs touched by this workflow:
|
||||||
|
# - the tag name (filtered by on.tags = v*, validated again at runtime
|
||||||
|
# against ^v\d+\.\d+\.\d+$ before being used in any string)
|
||||||
|
# All other values are either repo-controlled (paths under
|
||||||
|
# HellionChat/bin/Release derived from find / Get-ChildItem) or pinned
|
||||||
|
# URLs to goatcorp / gitea. Nothing from a webhook event payload (issue/PR
|
||||||
|
# titles, commit messages, etc.) flows into a run-step.
|
||||||
|
#
|
||||||
|
# Linux runner: gitea.com Cloud Actions only ships ubuntu-latest. The
|
||||||
|
# plugin csproj targets net10.0-windows, `dotnet build` cross-compiles on
|
||||||
|
# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v*"
|
||||||
|
# Manual recovery trigger. Use when a tag was pushed but the auto-run
|
||||||
|
# was missed or failed: `gh workflow run release.yml -f tag=v0.6.1`.
|
||||||
|
# The tag input is validated against the same semver regex as the
|
||||||
|
# auto-trigger before any string interpolation happens.
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
tag:
|
||||||
|
description: "Existing tag to (re)release, e.g. v0.6.1"
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
name: Build and attach release ZIP
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 20
|
||||||
|
|
||||||
|
steps:
|
||||||
|
# On push:tags, github.ref_name is the tag — checkout default works.
|
||||||
|
# On workflow_dispatch, ref defaults to the branch the action was
|
||||||
|
# invoked from; we need to explicitly check out the tag the user
|
||||||
|
# supplied so the build comes from the tagged commit, not main.
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||||
|
with:
|
||||||
|
ref: ${{ github.event.inputs.tag || github.ref }}
|
||||||
|
|
||||||
|
- name: Setup .NET 10
|
||||||
|
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
|
||||||
|
with:
|
||||||
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
|
- name: Download Dalamud staging
|
||||||
|
run: |
|
||||||
|
hooks="$HOME/.xlcore/dalamud/Hooks/dev"
|
||||||
|
mkdir -p "$hooks"
|
||||||
|
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
|
||||||
|
unzip -oq dalamud.zip -d "$hooks"
|
||||||
|
|
||||||
|
- name: Build (Release)
|
||||||
|
run: dotnet build HellionChat/HellionChat.csproj --configuration Release
|
||||||
|
|
||||||
|
- name: Locate latest.zip
|
||||||
|
id: locate
|
||||||
|
run: |
|
||||||
|
zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
|
||||||
|
if [ -z "$zip" ]; then
|
||||||
|
echo "latest.zip not found under HellionChat/bin/Release" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Found: $zip"
|
||||||
|
echo "path=$zip" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
# Build a release body from the matching changelog block in
|
||||||
|
# HellionChat.yaml plus a static install / docs footer. Fails the
|
||||||
|
# workflow if no block exists for the tagged version, which is the
|
||||||
|
# automated counterpart to the "yaml + repo.json + release body
|
||||||
|
# kept in sync" rule.
|
||||||
|
#
|
||||||
|
# GITHUB_REF_NAME is read via env: (not ${{ }} interpolation) so the
|
||||||
|
# tag value is treated as a PowerShell variable, not as inline shell
|
||||||
|
# text. The strict regex below rejects anything that is not a clean
|
||||||
|
# semver tag before it is used to build a string.
|
||||||
|
- name: Generate release body
|
||||||
|
shell: pwsh
|
||||||
|
env:
|
||||||
|
# workflow_dispatch carries the user-supplied tag in inputs.tag;
|
||||||
|
# push:tags carries it in github.ref_name. Either way the value
|
||||||
|
# is treated as a PowerShell variable (env-var pass), not as
|
||||||
|
# inline shell text, and validated against the semver regex
|
||||||
|
# below before any string interpolation.
|
||||||
|
TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
|
||||||
|
run: |
|
||||||
|
$tag = $env:TAG_NAME
|
||||||
|
if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
|
||||||
|
throw "Refusing to generate release body for non-semver tag: $tag"
|
||||||
|
}
|
||||||
|
$version = $tag.Substring(1)
|
||||||
|
|
||||||
|
$yamlPath = "HellionChat/HellionChat.yaml"
|
||||||
|
$raw = Get-Content -Path $yamlPath -Raw
|
||||||
|
|
||||||
|
$marker = "changelog: |-"
|
||||||
|
$idx = $raw.IndexOf($marker)
|
||||||
|
if ($idx -lt 0) { throw "changelog block not found in $yamlPath" }
|
||||||
|
|
||||||
|
# changelog: is the last top-level key in the manifest, so
|
||||||
|
# everything after the marker is the literal block. Strip the
|
||||||
|
# 2-space yaml indent from each line.
|
||||||
|
$afterMarker = $raw.Substring($idx + $marker.Length)
|
||||||
|
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
|
||||||
|
if ($_ -match '^ ') { $_.Substring(2) } else { $_ }
|
||||||
|
}) -join "`n"
|
||||||
|
|
||||||
|
$header = "**Hellion Chat $version"
|
||||||
|
$start = $changelogBody.IndexOf($header)
|
||||||
|
if ($start -lt 0) {
|
||||||
|
throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
|
||||||
|
}
|
||||||
|
|
||||||
|
$rest = $changelogBody.Substring($start)
|
||||||
|
$nextHdr = $rest.IndexOf("`n`n**Hellion Chat ", 1)
|
||||||
|
$trailer = $rest.IndexOf("`n`n---")
|
||||||
|
|
||||||
|
if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
|
||||||
|
$currentBlock = $rest.Substring(0, $nextHdr).TrimEnd()
|
||||||
|
} elseif ($trailer -ge 0) {
|
||||||
|
$currentBlock = $rest.Substring(0, $trailer).TrimEnd()
|
||||||
|
} else {
|
||||||
|
$currentBlock = $rest.TrimEnd()
|
||||||
|
}
|
||||||
|
|
||||||
|
# Static install / docs / licence footer is maintained as a
|
||||||
|
# separate file so the workflow YAML stays clean (no embedded
|
||||||
|
# heredoc that would have to be indented under the run-block).
|
||||||
|
$footerPath = ".github/release-footer.md"
|
||||||
|
if (-not (Test-Path $footerPath)) {
|
||||||
|
throw "Release footer template not found: $footerPath"
|
||||||
|
}
|
||||||
|
$footer = Get-Content -Path $footerPath -Raw
|
||||||
|
|
||||||
|
$body = $currentBlock + "`n" + $footer
|
||||||
|
$body | Out-File -FilePath release-body.md -Encoding utf8 -NoNewline
|
||||||
|
|
||||||
|
Write-Host "Generated release body for $tag :"
|
||||||
|
Write-Host "----------------------------------------"
|
||||||
|
Write-Host $body
|
||||||
|
Write-Host "----------------------------------------"
|
||||||
|
|
||||||
|
# Gitea-native release action. Creates the release if the tag has no
|
||||||
|
# release yet, or updates the existing one. body_path provides the
|
||||||
|
# generated release body, files attaches latest.zip. The auto-injected
|
||||||
|
# GITHUB_TOKEN on Gitea Actions has Gitea-API scope and is sufficient
|
||||||
|
# for release write.
|
||||||
|
- name: Attach to Gitea release
|
||||||
|
uses: https://gitea.com/actions/release-action@main
|
||||||
|
with:
|
||||||
|
# Explicit tag_name so the action targets the correct release in
|
||||||
|
# both push:tags (auto) and workflow_dispatch (manual recovery)
|
||||||
|
# modes. Without this, dispatch runs would default to the branch
|
||||||
|
# ref (main) and fail to find the release.
|
||||||
|
tag_name: ${{ github.event.inputs.tag || github.ref_name }}
|
||||||
|
files: ${{ steps.locate.outputs.path }}
|
||||||
|
body_path: release-body.md
|
||||||
|
api_key: ${{ secrets.GITHUB_TOKEN }}
|
||||||
+257
-488
@@ -1,193 +1,37 @@
|
|||||||
##############################################################
|
## Ignore Visual Studio temporary files, build results, and
|
||||||
|
## files generated by popular Visual Studio add-ons.
|
||||||
##
|
##
|
||||||
## .gitignore – Hellion Forge / Hellion Media
|
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
|
||||||
##
|
|
||||||
## 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
|
||||||
|
|
||||||
# Lokales Test-Projekt (bleibt aus dem Plugin-Repo raus;
|
# Local test project (stays out of the published plugin repo;
|
||||||
# pure-function safety net für Refactor-Cycles)
|
# pure-function safety net for refactor cycles)
|
||||||
HellionChat.Tests/
|
HellionChat.Tests/
|
||||||
ChatTwo.Tests
|
|
||||||
TestResults
|
|
||||||
*.db-shm
|
|
||||||
*.db-wal
|
|
||||||
|
|
||||||
# Packaging
|
# Packaging
|
||||||
pack/
|
pack/
|
||||||
|
|
||||||
# Specs und Plan-Dateien
|
# User-specific files
|
||||||
/.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
|
||||||
|
|
||||||
# MonoDevelop/Xamarin Studio
|
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||||
*.userprefs
|
*.userprefs
|
||||||
|
|
||||||
# Visual Studio Cache/Options Directory
|
# Mono auto generated files
|
||||||
.vs/
|
mono_crash.*
|
||||||
# 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/
|
||||||
@@ -203,24 +47,43 @@ bld/
|
|||||||
[Ll]og/
|
[Ll]og/
|
||||||
[Ll]ogs/
|
[Ll]ogs/
|
||||||
|
|
||||||
# ATL Project Build Output
|
# Visual Studio 2015/2017 cache/options directory
|
||||||
|
.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/
|
||||||
|
|
||||||
# MigrationBackup (Package Reference Convert Tool)
|
# ASP.NET Scaffolding
|
||||||
MigrationBackup/
|
ScaffoldingReadMe.txt
|
||||||
|
|
||||||
|
# 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
|
||||||
@@ -242,7 +105,6 @@ MigrationBackup/
|
|||||||
*.tmp_proj
|
*.tmp_proj
|
||||||
*_wpftmp.csproj
|
*_wpftmp.csproj
|
||||||
*.log
|
*.log
|
||||||
*.binlog
|
|
||||||
*.vspscc
|
*.vspscc
|
||||||
*.vssscc
|
*.vssscc
|
||||||
.builds
|
.builds
|
||||||
@@ -250,87 +112,10 @@ MigrationBackup/
|
|||||||
*.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
|
||||||
@@ -340,195 +125,62 @@ ipch/
|
|||||||
*.cachefile
|
*.cachefile
|
||||||
*.VC.db
|
*.VC.db
|
||||||
*.VC.VC.opendb
|
*.VC.VC.opendb
|
||||||
*.lscache
|
|
||||||
|
|
||||||
# Visual Studio cache (.cache files allgemein, .cache directories behalten)
|
# Visual Studio profiler
|
||||||
*.[Cc]ache
|
*.psess
|
||||||
!?*.[Cc]ache/
|
*.vsp
|
||||||
|
*.vspx
|
||||||
|
*.sap
|
||||||
|
|
||||||
# Web Workbench Sass
|
# Visual Studio Trace Files
|
||||||
.sass-cache/
|
*.e2e
|
||||||
|
|
||||||
|
# TFS 2012 Local Workspace
|
||||||
# =====================================================
|
$tf/
|
||||||
# NuGet & Dependencies
|
|
||||||
# =====================================================
|
|
||||||
|
|
||||||
# NuGet Packages
|
|
||||||
*.nupkg
|
|
||||||
*.snupkg
|
|
||||||
**/[Pp]ackages/*
|
|
||||||
!**/[Pp]ackages/build/
|
|
||||||
# Uncomment if necessary however generally it will be regenerated when needed
|
|
||||||
#!**/[Pp]ackages/repositories.config
|
|
||||||
*.nuget.props
|
|
||||||
*.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
|
|
||||||
csx/
|
|
||||||
*.build.csdef
|
|
||||||
|
|
||||||
# Microsoft Azure Emulator
|
|
||||||
ecf/
|
|
||||||
rcf/
|
|
||||||
|
|
||||||
# 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/
|
|
||||||
BundleArtifacts/
|
|
||||||
Package.StoreAssociation.xml
|
|
||||||
_pkginfo.txt
|
|
||||||
*.appx
|
|
||||||
*.appxbundle
|
|
||||||
*.appxupload
|
|
||||||
|
|
||||||
|
|
||||||
# =====================================================
|
|
||||||
# Datenbanken & SQL
|
|
||||||
# =====================================================
|
|
||||||
|
|
||||||
# SQL Server
|
|
||||||
*.mdf
|
|
||||||
*.ldf
|
|
||||||
*.ndf
|
|
||||||
|
|
||||||
# Andere DB-bezogene
|
|
||||||
*.dbmdl
|
|
||||||
*.dbproj.schemaview
|
|
||||||
*.jfm
|
|
||||||
|
|
||||||
# [!! 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
|
# Guidance Automation Toolkit
|
||||||
*.gpState
|
*.gpState
|
||||||
|
|
||||||
# Microsoft Fakes
|
# ReSharper is a .NET coding add-in
|
||||||
FakesAssemblies/
|
_ReSharper*/
|
||||||
|
*.[Rr]e[Ss]harper
|
||||||
|
*.DotSettings.user
|
||||||
|
|
||||||
# [!! OBSOLET 2026 !!] GhostDoc Plugin – Submain hat das Tool eingestellt
|
# TeamCity is a build add-in
|
||||||
*.GhostDoc.xml
|
_TeamCity*
|
||||||
|
|
||||||
# Tabs Studio
|
# DotCover is a Code Coverage Tool
|
||||||
*.tss
|
*.dotCover
|
||||||
|
|
||||||
# Telerik JustMock
|
# AxoCover is a Code Coverage Tool
|
||||||
*.jmconfig
|
.axoCover/*
|
||||||
|
!.axoCover/settings.json
|
||||||
|
|
||||||
# MFractors (Xamarin productivity tool)
|
# Coverlet is a free, cross platform Code Coverage Tool
|
||||||
.mfractor/
|
coverage*.json
|
||||||
|
coverage*.xml
|
||||||
|
coverage*.info
|
||||||
|
|
||||||
# DocProject Documentation Generator
|
# Visual Studio code coverage results
|
||||||
|
*.coverage
|
||||||
|
*.coveragexml
|
||||||
|
|
||||||
|
# NCrunch
|
||||||
|
_NCrunch_*
|
||||||
|
.*crunch*.local.xml
|
||||||
|
nCrunchTemp_*
|
||||||
|
|
||||||
|
# MightyMoose
|
||||||
|
*.mm.*
|
||||||
|
AutoTest.Net/
|
||||||
|
|
||||||
|
# Web workbench (sass)
|
||||||
|
.sass-cache/
|
||||||
|
|
||||||
|
# Installshield output folder
|
||||||
|
[Ee]xpress/
|
||||||
|
|
||||||
|
# DocProject is a documentation generator add-in
|
||||||
DocProject/buildhelp/
|
DocProject/buildhelp/
|
||||||
DocProject/Help/*.HxT
|
DocProject/Help/*.HxT
|
||||||
DocProject/Help/*.HxC
|
DocProject/Help/*.HxC
|
||||||
@@ -538,75 +190,69 @@ DocProject/Help/*.hhp
|
|||||||
DocProject/Help/Html2
|
DocProject/Help/Html2
|
||||||
DocProject/Help/html
|
DocProject/Help/html
|
||||||
|
|
||||||
|
# Click-Once directory
|
||||||
|
publish/
|
||||||
|
|
||||||
# =====================================================
|
# Publish Web Output
|
||||||
# Sonstige Sprachen & Tooling
|
*.[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
|
||||||
|
|
||||||
# Ionide (F# VS Code Tools)
|
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
||||||
.ionide/
|
# checkin your Azure Web App publish settings, but sensitive information contained
|
||||||
|
# in these scripts will be unencrypted
|
||||||
|
PublishScripts/
|
||||||
|
|
||||||
# Azure Stream Analytics Local Run
|
# NuGet Packages
|
||||||
ASALocalRun/
|
*.nupkg
|
||||||
|
# NuGet Symbol Packages
|
||||||
|
*.snupkg
|
||||||
|
# The packages folder can be ignored because of Package Restore
|
||||||
|
**/[Pp]ackages/*
|
||||||
|
# except build/, which is used as an MSBuild target.
|
||||||
|
!**/[Pp]ackages/build/
|
||||||
|
# Uncomment if necessary however generally it will be regenerated when needed
|
||||||
|
#!**/[Pp]ackages/repositories.config
|
||||||
|
# NuGet v3's project.json files produces more ignorable files
|
||||||
|
*.nuget.props
|
||||||
|
*.nuget.targets
|
||||||
|
|
||||||
# BizTalk Build Output
|
# Microsoft Azure Build Output
|
||||||
*.btp.cs
|
csx/
|
||||||
*.btm.cs
|
*.build.csdef
|
||||||
*.odx.cs
|
|
||||||
*.xsd.cs
|
|
||||||
|
|
||||||
# Orleans
|
# Microsoft Azure Emulator
|
||||||
orleans.codegen.cs
|
ecf/
|
||||||
|
rcf/
|
||||||
|
|
||||||
|
# Windows Store app package directories and files
|
||||||
|
AppPackages/
|
||||||
|
BundleArtifacts/
|
||||||
|
Package.StoreAssociation.xml
|
||||||
|
_pkginfo.txt
|
||||||
|
*.appx
|
||||||
|
*.appxbundle
|
||||||
|
*.appxupload
|
||||||
|
|
||||||
# =====================================================
|
# Visual Studio cache files
|
||||||
# [!! OBSOLET 2026 !!] Legacy-Tooling (eingestellt)
|
# files ending in .cache can be ignored
|
||||||
# Patterns bleiben aus Vorsicht drin.
|
*.[Cc]ache
|
||||||
# =====================================================
|
# but keep track of directories ending in .cache
|
||||||
|
!?*.[Cc]ache/
|
||||||
# [!! 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
|
|
||||||
# =====================================================
|
|
||||||
|
|
||||||
|
# Others
|
||||||
ClientBin/
|
ClientBin/
|
||||||
~$*
|
~$*
|
||||||
*~
|
*~
|
||||||
|
*.dbmdl
|
||||||
|
*.dbproj.schemaview
|
||||||
|
*.jfm
|
||||||
|
*.pfx
|
||||||
*.publishsettings
|
*.publishsettings
|
||||||
|
orleans.codegen.cs
|
||||||
|
|
||||||
# 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)
|
||||||
@@ -614,4 +260,127 @@ ClientBin/
|
|||||||
|
|
||||||
# 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
|
||||||
|
|||||||
+2
-12
@@ -1,17 +1,7 @@
|
|||||||
{
|
{
|
||||||
"MD003": { "style": "atx" },
|
"MD007": { "indent": 4 },
|
||||||
"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 },
|
|
||||||
"MD029": false,
|
"MD029": false,
|
||||||
"MD033": false,
|
"MD033": false,
|
||||||
"MD036": false,
|
"MD041": false
|
||||||
"MD040": true,
|
|
||||||
"MD041": false,
|
|
||||||
"MD046": { "style": "fenced" },
|
|
||||||
"MD048": { "style": "backtick" },
|
|
||||||
"MD049": { "style": "underscore" },
|
|
||||||
"MD050": { "style": "asterisk" }
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-47
@@ -1,50 +1,4 @@
|
|||||||
# ##############################################################
|
|
||||||
# #
|
|
||||||
# # .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/
|
*.Designer.cs
|
||||||
out/
|
|
||||||
build/
|
|
||||||
coverage/
|
|
||||||
|
|
||||||
# === Generierte C#-Files (Designer, Source Generators) ===
|
|
||||||
*.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
|
|
||||||
+2
-30
@@ -1,35 +1,7 @@
|
|||||||
{
|
{
|
||||||
"printWidth": 120,
|
"printWidth": 120,
|
||||||
"tabWidth": 4,
|
"tabWidth": 4,
|
||||||
"useTabs": false,
|
|
||||||
"semi": true,
|
|
||||||
"singleQuote": false,
|
|
||||||
"trailingComma": "all",
|
|
||||||
"bracketSpacing": true,
|
|
||||||
"arrowParens": "always",
|
|
||||||
"proseWrap": "always",
|
"proseWrap": "always",
|
||||||
"endOfLine": "lf",
|
"singleQuote": false,
|
||||||
"overrides": [
|
"endOfLine": "lf"
|
||||||
{
|
|
||||||
"files": "*.md",
|
|
||||||
"options": {
|
|
||||||
"printWidth": 100,
|
|
||||||
"tabWidth": 2
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"files": ["*.yml", "*.yaml"],
|
|
||||||
"options": {
|
|
||||||
"tabWidth": 2,
|
|
||||||
"singleQuote": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"files": "*.json",
|
|
||||||
"options": {
|
|
||||||
"tabWidth": 4,
|
|
||||||
"trailingComma": "none"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-51
@@ -1,53 +1,8 @@
|
|||||||
# ##############################################################
|
|
||||||
# #
|
|
||||||
# # .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:
|
||||||
# Zeilenlängen-Check aus (konsistent mit markdownlint MD013)
|
line-length: disable
|
||||||
line-length: disable
|
document-start: disable
|
||||||
|
truthy:
|
||||||
# YAML ohne führendes "---" erlaubt
|
allowed-values: ["true", "false", "on"]
|
||||||
document-start: disable
|
empty-lines:
|
||||||
|
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
|
|
||||||
|
|||||||
+44
-48
@@ -2,15 +2,14 @@
|
|||||||
|
|
||||||
## 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
|
HellionChat is a one-person side project developed under Hellion Forge. I maintain this in my spare time, which means
|
||||||
time, which means replies can take a few days. Please do not escalate just because a thread is
|
replies can take a few days. Please do not escalate just because a thread is quiet.
|
||||||
quiet.
|
|
||||||
|
|
||||||
When in doubt, assume good intent. Contributors come from different backgrounds, time zones and
|
When in doubt, assume good intent. Contributors come from different backgrounds, time zones and skill levels. A
|
||||||
skill levels. A clarifying question is almost always a better first move than an accusation.
|
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
|
Please also keep discussions on topic. This project is about a Dalamud chat plugin. Off-topic arguments belong
|
||||||
arguments belong elsewhere.
|
elsewhere.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -18,21 +17,20 @@ arguments belong elsewhere.
|
|||||||
|
|
||||||
We pledge to make our community welcoming, safe, and equitable for all.
|
We pledge to make our community welcoming, safe, and equitable for all.
|
||||||
|
|
||||||
We are committed to fostering an environment that respects and promotes the dignity, rights, and
|
We are committed to fostering an environment that respects and promotes the dignity, rights, and contributions of all
|
||||||
contributions of all individuals, regardless of characteristics including race, ethnicity, caste,
|
individuals, regardless of characteristics including race, ethnicity, caste, color, age, physical characteristics,
|
||||||
color, age, physical characteristics, neurodiversity, disability, sex or gender, gender identity or
|
neurodiversity, disability, sex or gender, gender identity or expression, sexual orientation, language, philosophy or
|
||||||
expression, sexual orientation, language, philosophy or religion, national or social origin,
|
religion, national or social origin, socio-economic position, level of education, or other status. The same privileges
|
||||||
socio-economic position, level of education, or other status. The same privileges of participation
|
of participation are extended to everyone who participates in good faith and in accordance with this Covenant.
|
||||||
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
|
While acknowledging differences in social norms, we all strive to meet our community's expectations for positive
|
||||||
for positive behavior. We also understand that our words and actions may be interpreted differently
|
behavior. We also understand that our words and actions may be interpreted differently than we intend based on culture,
|
||||||
than we intend based on culture, background, or native language.
|
background, or native language.
|
||||||
|
|
||||||
With these considerations in mind, we agree to behave mindfully toward each other and act in ways
|
With these considerations in mind, we agree to behave mindfully toward each other and act in ways that center our shared
|
||||||
that center our shared values, including:
|
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.
|
||||||
@@ -44,32 +42,31 @@ that center our shared values, including:
|
|||||||
|
|
||||||
## Restricted Behaviors
|
## Restricted Behaviors
|
||||||
|
|
||||||
We agree to restrict the following behaviors in our community. Instances, threats, and promotion of
|
We agree to restrict the following behaviors in our community. Instances, threats, and promotion of these behaviors are
|
||||||
these behaviors are violations of this Code of Conduct.
|
violations of this Code of Conduct.
|
||||||
|
|
||||||
1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal
|
1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal attention after any
|
||||||
attention after any clear request to stop.
|
clear request to stop.
|
||||||
2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a
|
2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a community member or group of
|
||||||
community member or group of people.
|
people.
|
||||||
3. **Stereotyping or discrimination.** Characterizing anyone's personality or behavior on the basis
|
3. **Stereotyping or discrimination.** Characterizing anyone's personality or behavior on the basis of immutable
|
||||||
of immutable identities or traits.
|
identities or traits.
|
||||||
4. **Sexualization.** Behaving in a way that would generally be considered inappropriately intimate
|
4. **Sexualization.** Behaving in a way that would generally be considered inappropriately intimate in the context or
|
||||||
in the context or purpose of the community.
|
purpose of the community.
|
||||||
5. **Violating confidentiality.** Sharing or acting on someone's personal or private information
|
5. **Violating confidentiality.** Sharing or acting on someone's personal or private information without their
|
||||||
without their permission.
|
permission.
|
||||||
6. **Endangerment.** Causing, encouraging, or threatening violence or other harm toward any person
|
6. **Endangerment.** Causing, encouraging, or threatening violence or other harm toward any person or group.
|
||||||
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
|
1. **Misleading identity.** Impersonating someone else for any reason, or pretending to be someone else to evade
|
||||||
else to evade enforcement actions.
|
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
|
3. **Promotional materials.** Sharing marketing or other commercial content in a way that is outside the norms of the
|
||||||
the norms of the community.
|
community.
|
||||||
4. **Irresponsible communication.** Failing to responsibly present content which includes, links to,
|
4. **Irresponsible communication.** Failing to responsibly present content which includes, links to, or describes any
|
||||||
or describes any other restricted behaviors.
|
other restricted behaviors.
|
||||||
|
|
||||||
## Reporting
|
## Reporting
|
||||||
|
|
||||||
@@ -80,13 +77,12 @@ 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
|
Reports stay private. I will acknowledge within a few weekdays (European business hours) and tell you what I plan to do.
|
||||||
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
|
I am the sole maintainer, so enforcement is a single-person process. I will pick the lightest measure that actually
|
||||||
measure that actually resolves the situation:
|
resolves the situation:
|
||||||
|
|
||||||
1. Private note asking the behaviour to stop.
|
1. Private note asking the behaviour to stop.
|
||||||
2. Public correction in the affected thread.
|
2. Public correction in the affected thread.
|
||||||
@@ -99,16 +95,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
|
This Code of Conduct applies to all spaces the project owns or that I run on its behalf: the GitHub repository, GitHub
|
||||||
repository, GitHub Discussions, project-related Discord conversations, and the maintainer contact
|
Discussions, project-related Discord conversations, and the maintainer contact listed in [`SECURITY.md`](SECURITY.md).
|
||||||
listed in [`SECURITY.md`](SECURITY.md). It also applies when someone is identifiably representing
|
It also applies when someone is identifiably representing HellionChat elsewhere, for example when posting as a
|
||||||
HellionChat elsewhere, for example when posting as a HellionChat maintainer in the Dalamud Discord.
|
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
|
Contributor Covenant is stewarded by the Organization for Ethical Source and licensed under CC BY-SA 4.0. To view a copy
|
||||||
4.0. To view a copy of this license, visit
|
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/).
|
||||||
|
|||||||
+58
-70
@@ -1,75 +1,69 @@
|
|||||||
# Contributing to HellionChat
|
# Contributing to HellionChat
|
||||||
|
|
||||||
Thanks for taking a look. HellionChat is a one-person side project developed under Hellion Forge. It
|
Thanks for taking a look. HellionChat is a one-person side project developed under Hellion Forge. It started as a fork
|
||||||
started as a fork of [Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become a
|
of [Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become a standalone plugin under its own namespace,
|
||||||
standalone plugin under its own namespace, IPC channels and source tree (standalone-cut completed in
|
IPC channels and source tree (standalone-cut completed in v1.0.0). Forking HellionChat itself is explicitly permitted
|
||||||
v1.0.0). Forking HellionChat itself is explicitly permitted under the EUPL-1.2.
|
under the EUPL-1.2.
|
||||||
|
|
||||||
This document explains what I am looking for, what I am not, and how to make a contribution land
|
This document explains what I am looking for, what I am not, and how to make a contribution land smoothly.
|
||||||
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
|
- Read the [README](README.md) so you understand the scope: a privacy-focused, EUPL-1.2-licensed Dalamud plugin that
|
||||||
Dalamud plugin that intentionally removes the upstream webinterface and ships privacy-first
|
intentionally removes the upstream webinterface and ships privacy-first defaults.
|
||||||
defaults.
|
- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active cherry-picking from upstream Chat 2 has ended in the
|
||||||
- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active cherry-picking from upstream Chat 2
|
v1.4.x cycle; HellionChat continues as an independent codebase. Existing upstream-derived code keeps its attribution.
|
||||||
has ended in the v1.4.x cycle; HellionChat continues as an independent codebase. Existing
|
New contributions stand on their own and do not need to be cherry-pick-compatible.
|
||||||
upstream-derived code keeps its attribution. New contributions stand on their own and do not need
|
- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes through a private advisory, never a public issue
|
||||||
to be cherry-pick-compatible.
|
or PR.
|
||||||
- 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
|
`HellionChat/Resources/HellionStrings.*.resx`. Translations for upstream Chat 2 strings (`Language.*.resx`) are not
|
||||||
(`Language.*.resx`) are not handled here; those go to the upstream Chat 2 project.
|
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
|
- New features that fit the privacy-first scope and do not duplicate what an existing Dalamud plugin already does well.
|
||||||
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.
|
- Re-introducing the webinterface or any remote-access feature. It was removed in v0.2.0 on purpose. See the README
|
||||||
See the README section "Was gegenüber Chat 2 fehlt".
|
section "Was gegenüber Chat 2 fehlt".
|
||||||
- Features that bypass the privacy filter or weaken the default retention behaviour without an
|
- Features that bypass the privacy filter or weaken the default retention behaviour without an explicit, documented
|
||||||
explicit, documented opt-in.
|
opt-in.
|
||||||
- Sweeping refactors that touch large parts of the codebase. The maintenance cost outweighs the
|
- Sweeping refactors that touch large parts of the codebase. The maintenance cost outweighs the benefit for a one-person
|
||||||
benefit for a one-person project. (This used to be doubly important because of the upstream
|
project. (This used to be doubly important because of the upstream cherry-pick path; that path is closed now, but the
|
||||||
cherry-pick path; that path is closed now, but the rule still holds on its own merits.)
|
rule still holds on its own merits.)
|
||||||
- AI-generated code dropped in without disclosure or human review. See
|
- AI-generated code dropped in without disclosure or human review. See [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md)
|
||||||
[`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle AI assistance on my side; I
|
for how I handle AI assistance on my side; I expect comparable transparency from contributors.
|
||||||
expect comparable transparency from contributors.
|
|
||||||
|
|
||||||
If you are unsure whether an idea fits, open a feature-request issue first and ask before writing
|
If you are unsure whether an idea fits, open a feature-request issue first and ask before writing code. I would rather
|
||||||
code. I would rather say "no" to a proposal than to a finished pull request.
|
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
|
1. Open an issue (bug or feature request) using the templates under `.github/ISSUE_TEMPLATE/`. Skip this for trivial
|
||||||
this for trivial typos.
|
typos.
|
||||||
2. Fork the repository and branch off `main`. Branch naming is informal; something like
|
2. Fork the repository and branch off `main`. Branch naming is informal; something like `fix/auto-tell-history-empty` or
|
||||||
`fix/auto-tell-history-empty` or `feat/theme-export` is fine.
|
`feat/theme-export` is fine.
|
||||||
3. Match the existing code style. The repository ships an `.editorconfig` that VS Code and Rider
|
3. Match the existing code style. The repository ships an `.editorconfig` that VS Code and Rider pick up automatically.
|
||||||
pick up automatically.
|
4. Keep commits focused. Several small commits with clear messages are easier to review than one large one.
|
||||||
4. Keep commits focused. Several small commits with clear messages are easier to review than one
|
Squash-on-merge happens at the PR level if needed.
|
||||||
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
|
6. Open the pull request against `main`. The PR template will ask you to summarise the change, the testing you did and
|
||||||
testing you did and any compatibility notes.
|
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
|
- A working Dalamud dev environment with `DALAMUD_HOME` set (XIVLauncher installed and launched once is the simplest
|
||||||
is the simplest path)
|
path)
|
||||||
- VS Code with the C# Dev Kit, Rider, or Visual Studio
|
- VS Code with the C# Dev Kit, Rider, or Visual Studio
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -77,12 +71,11 @@ 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
|
There are currently no tests in `HellionChat.sln`. If you add a test project, point it at the relevant subsystems
|
||||||
relevant subsystems (privacy filter, configuration migration, message store) and mention it in the
|
(privacy filter, configuration migration, message store) and mention it in the PR.
|
||||||
PR.
|
|
||||||
|
|
||||||
For a smoke test in-game: build, copy the output into your Dalamud `devPlugins/HellionChat/`
|
For a smoke test in-game: build, copy the output into your Dalamud `devPlugins/HellionChat/` directory and load it via
|
||||||
directory and load it via `/xlplugins`.
|
`/xlplugins`.
|
||||||
|
|
||||||
## Continuous Integration
|
## Continuous Integration
|
||||||
|
|
||||||
@@ -93,33 +86,30 @@ 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
|
A pull request will not be merged while either of these is failing. CodeQL findings on changed code need to be
|
||||||
need to be addressed; pre-existing findings on untouched code are tracked separately.
|
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.
|
The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` are **not** translated here. They are kept as-is
|
||||||
They are kept as-is from the last upstream sync and remain the work of the Chat 2 Crowdin community.
|
from the last upstream sync and remain the work of the Chat 2 Crowdin community. Active cherry-picking from upstream
|
||||||
Active cherry-picking from upstream ended in the v1.4.x cycle (see
|
ended in the v1.4.x cycle (see [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future translation improvements to
|
||||||
[`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future translation improvements to those
|
those upstream strings will not flow into HellionChat automatically anymore. If you have improvements for the original
|
||||||
upstream strings will not flow into HellionChat automatically anymore. If you have improvements for
|
Chat 2 strings, please contribute them to [Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) directly.
|
||||||
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
|
- Your contribution is your own work, or you have the right to contribute it under the project licence.
|
||||||
licence.
|
- You agree that your contribution will be released under the [EUPL-1.2](LICENSE), the same licence as the rest of the
|
||||||
- You agree that your contribution will be released under the [EUPL-1.2](LICENSE), the same licence
|
project.
|
||||||
as the rest of the project.
|
|
||||||
|
|
||||||
There is no separate CLA. Forking HellionChat is explicitly permitted under the EUPL-1.2, as with
|
There is no separate CLA. Forking HellionChat is explicitly permitted under the EUPL-1.2, as with any EUPL-licensed
|
||||||
any EUPL-licensed project.
|
project.
|
||||||
|
|
||||||
## Response Times
|
## Response Times
|
||||||
|
|
||||||
@@ -129,9 +119,8 @@ any EUPL-licensed 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
|
I respond on weekdays during European business hours and take weekends and FFXIV patch days off. A pull request that
|
||||||
pull request that sits for a few days has not been ignored. Pinging once after a week is fine;
|
sits for a few days has not been ignored. Pinging once after a week is fine; please do not ping daily.
|
||||||
please do not ping daily.
|
|
||||||
|
|
||||||
## First-time setup
|
## First-time setup
|
||||||
|
|
||||||
@@ -141,10 +130,9 @@ After cloning, run once:
|
|||||||
./scripts/setup-hooks.sh
|
./scripts/setup-hooks.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight
|
This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight (versions/manifest/changelog/build).
|
||||||
(versions/manifest/changelog/build).
|
|
||||||
|
|
||||||
### Test suite
|
### Test suite
|
||||||
|
|
||||||
The plugin's test suite lives in a separate local repository and is not part of this codebase. If
|
The plugin's test suite lives in a separate local repository and is not part of this codebase. If you need access for
|
||||||
you need access for development, contact the maintainer.
|
development, contact the maintainer.
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
@@ -1,15 +1,12 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
|
||||||
using Dalamud.Game.Text;
|
using Dalamud.Game.Text;
|
||||||
using Dalamud.Game.Text.SeStringHandling;
|
using Dalamud.Game.Text.SeStringHandling;
|
||||||
using Dalamud.Interface.ImGuiNotification;
|
|
||||||
using HellionChat.Code;
|
using HellionChat.Code;
|
||||||
using HellionChat.GameFunctions.Types;
|
using HellionChat.GameFunctions.Types;
|
||||||
using HellionChat.Resources;
|
using HellionChat.Resources;
|
||||||
using HellionChat.Util;
|
using HellionChat.Util;
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace HellionChat;
|
namespace HellionChat;
|
||||||
|
|
||||||
@@ -20,50 +17,27 @@ 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 ILogger<AutoTellTabsService> _logger;
|
private readonly object _tempTabsLock = new();
|
||||||
|
|
||||||
// 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
|
|
||||||
// of usage. Separate pool from AutoTellTabsLimit (15) — pinned tabs live
|
|
||||||
// in their own bucket. A configurable cap is a vault-backlog anchor for
|
|
||||||
// a later cycle if tester feedback demands it.
|
|
||||||
internal const int MaxPinnedTempTabs = 5;
|
|
||||||
|
|
||||||
private bool _initialized;
|
private bool _initialized;
|
||||||
|
|
||||||
// Set when Initialize ran before a character was available; cleared once the
|
internal AutoTellTabsService(Plugin plugin, MessageManager messageManager, MessageStore store)
|
||||||
// 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
|
internal int ActiveTempTabCount
|
||||||
// mutate IsPinned or remove tabs — the count adapts automatically.
|
{
|
||||||
// Replaces an Interlocked counter: the pin-state transitions are cold-path
|
get
|
||||||
// and don't need lock-free reads.
|
{
|
||||||
internal int ActiveTempTabCount =>
|
lock (_tempTabsLock)
|
||||||
Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInUnpinnedPool);
|
{
|
||||||
|
return Plugin.Config.Tabs.Count(t => t.IsTempTab);
|
||||||
internal int PinnedTempTabCount => Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
internal void Initialize()
|
internal void Initialize()
|
||||||
{
|
{
|
||||||
@@ -72,71 +46,11 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pinned tabs come out of the JSON with TellTarget set but
|
|
||||||
// CurrentChannel reset (NonSerialized). Without re-seeding, the chat
|
|
||||||
// input has no tell-target on the active pinned tab, and the
|
|
||||||
// game-side channel hook only repaints CurrentChannel once the user
|
|
||||||
// triggers a /tell or channel switch.
|
|
||||||
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()
|
|
||||||
{
|
|
||||||
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);
|
|
||||||
_logger.LogDebug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
|
|
||||||
|
|
||||||
foreach (var tab in Plugin.Config.Tabs)
|
|
||||||
{
|
|
||||||
if (!TabLifecycleHelpers.IsInPinnedPool(tab))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (tab.TellTarget is null || !tab.TellTarget.IsSet())
|
|
||||||
{
|
|
||||||
_logger.LogWarning(
|
|
||||||
$"[Pin] Pinned tab '{tab.Name}' has no usable TellTarget "
|
|
||||||
+ $"(Name={tab.TellTarget?.Name ?? "<null>"} World={tab.TellTarget?.World ?? 0}). "
|
|
||||||
+ "Chat input on this tab will be empty until the partner sends a tell or you /tell manually."
|
|
||||||
);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
tab.Channel ??= InputChannel.Tell;
|
|
||||||
tab.CurrentChannel.Channel = InputChannel.Tell;
|
|
||||||
tab.CurrentChannel.TellTarget = tab.TellTarget.Clone();
|
|
||||||
|
|
||||||
// MessageList is NonSerialized so pinned tabs come back empty.
|
|
||||||
// Preload the same history window the spawn path uses so the user
|
|
||||||
// sees the recent conversation, not a blank tab.
|
|
||||||
PreloadHistory(tab, tab.TellTarget.Name, tab.TellTarget.World, Guid.Empty);
|
|
||||||
|
|
||||||
_logger.LogDebug(
|
|
||||||
$"[Pin] Rehydrated '{tab.Name}' -> Tell target {tab.TellTarget.Name}@{tab.TellTarget.World}"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
if (!_initialized)
|
if (!_initialized)
|
||||||
@@ -144,7 +58,6 @@ 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;
|
||||||
@@ -169,7 +82,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)
|
||||||
_logger.LogWarning(
|
Plugin.Log.Warning(
|
||||||
$"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
|
$"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
|
||||||
+ $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
|
+ $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
|
||||||
+ $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
|
+ $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
|
||||||
@@ -178,58 +91,21 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Three steps, because building the tab pulls history out of the store and
|
lock (_tempTabsLock)
|
||||||
// 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 — no AddMessage here,
|
// Already routed via MessageManager pipeline
|
||||||
// HandleTell runs after the delivery loop. Repair the tell-target if
|
|
||||||
// the fallback hit a pinned tab whose TellTarget didn't survive a
|
|
||||||
// previous round-trip — keeps FindTempTab fast on the next message.
|
|
||||||
if (
|
|
||||||
existing.IsPinned
|
|
||||||
&& (existing.TellTarget is null || !existing.TellTarget.IsSet())
|
|
||||||
)
|
|
||||||
{
|
|
||||||
existing.TellTarget = new TellTarget(
|
|
||||||
partner.Value.Name,
|
|
||||||
partner.Value.World,
|
|
||||||
0,
|
|
||||||
TellReason.Direct
|
|
||||||
);
|
|
||||||
_plugin.SaveConfig();
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
generation = _tabGeneration;
|
if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
{
|
{
|
||||||
raced.AddMessage(message, unread: true);
|
DropOldestTempTab();
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CommitTempTab(tab);
|
SpawnTempTab(partner.Value, message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -270,81 +146,53 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static Tab? FindTempTab(string name, uint world)
|
private Tab? FindTempTab(string name, uint world)
|
||||||
{
|
{
|
||||||
var byTarget = Plugin.Config.Tabs.FirstOrDefault(t =>
|
return Plugin.Config.Tabs.FirstOrDefault(t =>
|
||||||
t.IsTempTab
|
t.IsTempTab
|
||||||
&& t.TellTarget != null
|
&& t.TellTarget != null
|
||||||
&& string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
|
&& string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
|
||||||
&& t.TellTarget.World == world
|
&& t.TellTarget.World == world
|
||||||
);
|
);
|
||||||
if (byTarget != null)
|
|
||||||
return byTarget;
|
|
||||||
|
|
||||||
// Fallback: match by tab name. Pinned tabs are named via
|
|
||||||
// FormatTabName(player, world) at spawn time, so the name is a
|
|
||||||
// stable secondary key when TellTarget didn't survive a save/load
|
|
||||||
// (older configs from a renamed pin, malformed migrations, etc.).
|
|
||||||
var expectedName = FormatTabName(name, world);
|
|
||||||
return Plugin.Config.Tabs.FirstOrDefault(t =>
|
|
||||||
t.IsTempTab && string.Equals(t.Name, expectedName, StringComparison.OrdinalIgnoreCase)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Lock-protected lookup for the framework-thread caller (TellRouterService).
|
private void DropOldestTempTab()
|
||||||
// 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)
|
// Prioritize greeted tabs for drop; within each bucket, drop by oldest LastActivity
|
||||||
return FindTempTab(name, world);
|
var victim = Plugin
|
||||||
}
|
.Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
|
||||||
|
.Where(t => t.Tab.IsTempTab)
|
||||||
|
.OrderByDescending(t => t.Tab.IsGreeted)
|
||||||
|
.ThenBy(t => t.Tab.LastActivity)
|
||||||
|
.FirstOrDefault();
|
||||||
|
|
||||||
internal void DropOldestTempTab()
|
if (victim.Tab == null)
|
||||||
{
|
|
||||||
// Lock the list-structure ops so the (currently caller-less) Unpin path
|
|
||||||
// can't race the worker; re-entrant when HandleTell already holds the lock.
|
|
||||||
lock (TabsListLock)
|
|
||||||
{
|
{
|
||||||
// Pinned tabs live in their own bucket (MaxPinnedTempTabs) and are
|
return;
|
||||||
// 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();
|
|
||||||
|
|
||||||
if (victim.Tab == null)
|
// Clean up pop-out window if tab is popped out
|
||||||
|
if (victim.Tab.PopOut)
|
||||||
|
{
|
||||||
|
var popout = _plugin.ChatLogWindow.ActivePopouts.FirstOrDefault(p =>
|
||||||
|
p.TabIdentifier == victim.Tab.Identifier
|
||||||
|
);
|
||||||
|
if (popout != null)
|
||||||
{
|
{
|
||||||
return;
|
popout.IsOpen = false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var dropped = victim.Tab;
|
Plugin.Config.Tabs.RemoveAt(victim.Index);
|
||||||
// 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 the UI selection if it pointed at the dropped tab, and close any
|
// Re-anchor active tab to avoid silent switch when tab is dropped
|
||||||
// pop-out window the dropped tab owned. Both run on the PendingMessage worker
|
if (victim.Index <= _plugin.LastTab)
|
||||||
// thread and touch window state the Draw path reads (OnTabActivated re-seed +
|
{
|
||||||
// the pool's Unbind), so marshal onto the framework thread to serialize with
|
_plugin.WantedTab = 0;
|
||||||
// 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);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Runs WITHOUT TabsListLock: PreloadHistory hits the store, which used to hold
|
private void SpawnTempTab((string Name, uint World) partner, Message currentMessage)
|
||||||
// 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);
|
||||||
|
|
||||||
@@ -353,26 +201,13 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
|
|
||||||
tab.AddMessage(currentMessage, unread: true);
|
tab.AddMessage(currentMessage, unread: true);
|
||||||
|
|
||||||
return tab;
|
// Open as pop-out if configured (set before Tabs.Add for next render-tick)
|
||||||
}
|
if (Plugin.Config.AutoTellTabsOpenAsPopout)
|
||||||
|
|
||||||
// Caller MUST hold TabsListLock.
|
|
||||||
private void CommitTempTab(Tab tab)
|
|
||||||
{
|
|
||||||
if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
|
|
||||||
{
|
{
|
||||||
DropOldestTempTab();
|
tab.PopOut = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
||||||
@@ -380,7 +215,6 @@ 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),
|
||||||
@@ -450,7 +284,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
|
||||||
_logger.LogError(ex, "[AutoTellTabs] History preload failed");
|
Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
|
||||||
tab.Messages.AddPrune(
|
tab.Messages.AddPrune(
|
||||||
MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
|
MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
|
||||||
MessageManager.MessageDisplayLimit
|
MessageManager.MessageDisplayLimit
|
||||||
@@ -488,7 +322,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
lock (TabsListLock)
|
lock (_tempTabsLock)
|
||||||
{
|
{
|
||||||
// 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))
|
||||||
@@ -500,135 +334,41 @@ 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 (TabsListLock)
|
lock (_tempTabsLock)
|
||||||
{
|
{
|
||||||
// Pinned TempTabs must survive char-switch — that's the whole point
|
// Snapshot active tab index before mutating list
|
||||||
// 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 currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab;
|
||||||
|
|
||||||
|
// Clean up pop-out windows before removing temp tabs
|
||||||
var poppedTempTabIds = Plugin
|
var poppedTempTabIds = Plugin
|
||||||
.Config.Tabs.Where(t =>
|
.Config.Tabs.Where(t => t.IsTempTab && t.PopOut)
|
||||||
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
|
|
||||||
// the list. Filtering on the live pool (not the PopOut flag) also catches
|
|
||||||
// manually right-clicked pop-outs, which never set the flag.
|
|
||||||
foreach (var id in poppedTempTabIds)
|
|
||||||
_plugin.ChannelPopoutPool.TryClose(id);
|
|
||||||
|
|
||||||
Plugin.Config.Tabs.RemoveAll(TabLifecycleHelpers.IsInUnpinnedPool);
|
|
||||||
|
|
||||||
// HandleTell builds a tab outside the lock; bumping here lets it detect
|
|
||||||
// that the world moved on and drop what it built. Read and compared under
|
|
||||||
// the same lock, so no volatile needed.
|
|
||||||
_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.MainWindow?.ResetActiveTabIfRemoved(a);
|
var poppedSet = poppedTempTabIds.ToHashSet();
|
||||||
}
|
foreach (
|
||||||
}
|
var popout in _plugin
|
||||||
}
|
.ChatLogWindow.ActivePopouts.Where(p => poppedSet.Contains(p.TabIdentifier))
|
||||||
|
.ToList()
|
||||||
internal bool TryPin(Tab tab)
|
)
|
||||||
{
|
{
|
||||||
if (!tab.IsTempTab || tab.IsPinned)
|
popout.IsOpen = false;
|
||||||
{
|
}
|
||||||
_logger.LogDebug(
|
|
||||||
$"[Pin] TryPin skipped: IsTempTab={tab.IsTempTab} IsPinned={tab.IsPinned}"
|
|
||||||
);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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)
|
|
||||||
{
|
|
||||||
if (PinnedTempTabCount >= MaxPinnedTempTabs)
|
|
||||||
{
|
|
||||||
WrapperUtil.AddNotification(
|
|
||||||
string.Format(HellionStrings.PinTab_LimitReached, MaxPinnedTempTabs),
|
|
||||||
NotificationType.Warning
|
|
||||||
);
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tab.IsPinned = true;
|
Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab);
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogDebug(
|
// Force switch to tab 0 if active tab was temp or index is now out of range
|
||||||
$"[Pin] Pinned tab '{tab.Name}' target={tab.TellTarget?.Name}@{tab.TellTarget?.World}"
|
var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
|
||||||
);
|
if (currentWasTempTab || !stillValid)
|
||||||
_plugin.SaveConfig();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void Unpin(Tab tab)
|
|
||||||
{
|
|
||||||
if (!tab.IsPinned)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the unpinned pool is already full, dropping the oldest before
|
|
||||||
// flipping the flag avoids counting the just-unpinned tab as a drop
|
|
||||||
// candidate. Under lock, since DropOldestTempTab mutates the list.
|
|
||||||
// SaveConfig stays outside, see TryPin.
|
|
||||||
lock (TabsListLock)
|
|
||||||
{
|
|
||||||
if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
|
|
||||||
{
|
{
|
||||||
DropOldestTempTab();
|
_plugin.WantedTab = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
tab.IsPinned = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.LogDebug("[Pin] Unpinned tab '{TabName}'", tab.Name);
|
|
||||||
_plugin.SaveConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void PromoteToPermanent(Tab tab)
|
|
||||||
{
|
|
||||||
if (!tab.IsTempTab)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Drops the temp/pin flags, the persisted tell target AND the runtime
|
|
||||||
// channel's tell state. The runtime-channel clear is the CORR-1 guard —
|
|
||||||
// see StripTellBindingOnPromote; clearing Tab.TellTarget alone would leave
|
|
||||||
// CurrentChannel.Channel == Tell + a stale target and route a typed line
|
|
||||||
// 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();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
using System.Runtime.CompilerServices;
|
|
||||||
using HellionChat.Util;
|
|
||||||
|
|
||||||
namespace HellionChat.Branding;
|
namespace HellionChat.Branding;
|
||||||
|
|
||||||
// Centralised — a future invite/URL rotation only touches this file.
|
// Centralised — a future invite/URL rotation only touches this file.
|
||||||
@@ -10,27 +7,6 @@ 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";
|
||||||
|
|
||||||
// CA2255 warns against [ModuleInitializer] in library code, but Dalamud
|
|
||||||
// loads the plugin DLL directly so the module-init pass is the right hook
|
|
||||||
// for a one-shot URL sanity check at plugin load.
|
|
||||||
#pragma warning disable CA2255
|
|
||||||
[ModuleInitializer]
|
|
||||||
#pragma warning restore CA2255
|
|
||||||
internal static void ValidateUrls()
|
|
||||||
{
|
|
||||||
UrlValidation.ValidateAll(
|
|
||||||
nameof(BrandingLinks),
|
|
||||||
HellionForgeDiscordInvite,
|
|
||||||
HellionForgeGitea,
|
|
||||||
HellionChatRepo,
|
|
||||||
HellionChatCustomRepoManifest,
|
|
||||||
HellionForgeWebsite,
|
|
||||||
HellionMediaWebsite
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
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
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
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
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -7,36 +7,36 @@ public enum ChatSource : ushort
|
|||||||
{
|
{
|
||||||
None = 0,
|
None = 0,
|
||||||
|
|
||||||
// The player controlled by this client
|
/// <summary>The player currently controlled by the local client.</summary>
|
||||||
LocalPlayer = 1 << XivChatRelationKind.LocalPlayer,
|
LocalPlayer = 1 << XivChatRelationKind.LocalPlayer,
|
||||||
|
|
||||||
// Member of the local party
|
/// <summary>A player in the same 4-man or 8-man party as the local player.</summary>
|
||||||
PartyMember = 1 << XivChatRelationKind.PartyMember,
|
PartyMember = 1 << XivChatRelationKind.PartyMember,
|
||||||
|
|
||||||
// Member of the alliance
|
/// <summary>A player in the same alliance raid.</summary>
|
||||||
AllianceMember = 1 << XivChatRelationKind.AllianceMember,
|
AllianceMember = 1 << XivChatRelationKind.AllianceMember,
|
||||||
|
|
||||||
// Other player
|
/// <summary>A player not in the local player's party or alliance.</summary>
|
||||||
OtherPlayer = 1 << XivChatRelationKind.OtherPlayer,
|
OtherPlayer = 1 << XivChatRelationKind.OtherPlayer,
|
||||||
|
|
||||||
// Enemy in combat
|
/// <summary>An enemy entity that is currently in combat with the player or party.</summary>
|
||||||
EngagedEnemy = 1 << XivChatRelationKind.EngagedEnemy,
|
EngagedEnemy = 1 << XivChatRelationKind.EngagedEnemy,
|
||||||
|
|
||||||
// Enemy out of combat
|
/// <summary>An enemy entity that is not yet in combat or claimed.</summary>
|
||||||
UnengagedEnemy = 1 << XivChatRelationKind.UnengagedEnemy,
|
UnengagedEnemy = 1 << XivChatRelationKind.UnengagedEnemy,
|
||||||
|
|
||||||
// Friendly NPC
|
/// <summary>An NPC that is friendly or neutral to the player (e.g., EventNPCs).</summary>
|
||||||
FriendlyNpc = 1 << XivChatRelationKind.FriendlyNpc,
|
FriendlyNpc = 1 << XivChatRelationKind.FriendlyNpc,
|
||||||
|
|
||||||
// Own pet or companion
|
/// <summary>A pet (Summoner/Scholar) or companion (Chocobo) belonging to the local player.</summary>
|
||||||
PetOrCompanion = 1 << XivChatRelationKind.PetOrCompanion,
|
PetOrCompanion = 1 << XivChatRelationKind.PetOrCompanion,
|
||||||
|
|
||||||
// Pet or companion of party members
|
/// <summary>A pet or companion belonging to a member of the local player's party.</summary>
|
||||||
PetOrCompanionParty = 1 << XivChatRelationKind.PetOrCompanionParty,
|
PetOrCompanionParty = 1 << XivChatRelationKind.PetOrCompanionParty,
|
||||||
|
|
||||||
// Pet or companion of alliance members
|
/// <summary>A pet or companion belonging to a member of the alliance.</summary>
|
||||||
PetOrCompanionAlliance = 1 << XivChatRelationKind.PetOrCompanionAlliance,
|
PetOrCompanionAlliance = 1 << XivChatRelationKind.PetOrCompanionAlliance,
|
||||||
|
|
||||||
// Pet or companion of other players
|
/// <summary>A pet or companion belonging to a player not in the party or alliance.</summary>
|
||||||
PetOrCompanionOther = 1 << XivChatRelationKind.PetOrCompanionOther,
|
PetOrCompanionOther = 1 << XivChatRelationKind.PetOrCompanionOther,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,10 @@
|
|||||||
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()
|
||||||
{
|
{
|
||||||
@@ -59,7 +52,7 @@ internal sealed class Commands : IDisposable
|
|||||||
{
|
{
|
||||||
if (!Registered.TryGetValue(command, out var wrapper))
|
if (!Registered.TryGetValue(command, out var wrapper))
|
||||||
{
|
{
|
||||||
_logger.LogWarning($"Missing registration for command {command}");
|
Plugin.Log.Warning($"Missing registration for command {command}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,7 +62,7 @@ internal sealed class Commands : IDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, $"Error while executing command {command}");
|
Plugin.Log.Error(ex, $"Error while executing command {command}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+182
-382
@@ -1,5 +1,4 @@
|
|||||||
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;
|
||||||
@@ -35,7 +34,7 @@ public class ConfigKeyBind
|
|||||||
[Serializable]
|
[Serializable]
|
||||||
public class Configuration : IPluginConfiguration
|
public class Configuration : IPluginConfiguration
|
||||||
{
|
{
|
||||||
internal const int LatestVersion = 28;
|
private const int LatestVersion = 16;
|
||||||
|
|
||||||
public int Version { get; set; } = LatestVersion;
|
public int Version { get; set; } = LatestVersion;
|
||||||
|
|
||||||
@@ -45,80 +44,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;
|
public bool UseCompactDensity = true;
|
||||||
|
|
||||||
// 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;
|
||||||
|
|
||||||
// Stays empty here. Dalamud deserialises with Json.NET's default settings,
|
// Empty set means the migration has not run yet — see Plugin.cs v6→v7.
|
||||||
// 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.
|
||||||
// to the failsafe via PrivacyDefaults; existing configs keep their saved
|
public bool PrivacyPersistUnknownChannels;
|
||||||
// choice because the deserializer overrides this initializer.
|
|
||||||
public bool PrivacyPersistUnknownChannels = Privacy
|
|
||||||
.PrivacyDefaults
|
|
||||||
.DefaultPersistUnknownChannels;
|
|
||||||
|
|
||||||
// Dedup unknown-ChatType warnings so a chatty filter doesn't spam
|
|
||||||
// the log every frame. NonSerialized so the warning fires once per
|
|
||||||
// runtime, not once-ever-per-install.
|
|
||||||
[NonSerialized]
|
|
||||||
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))
|
||||||
// Runs per message on the worker thread while the settings UI can Add to the
|
return true;
|
||||||
// same set from the draw thread. A HashSet.Contains racing an Add that
|
return PrivacyPersistUnknownChannels;
|
||||||
// resizes buckets can return the wrong answer -- and this answer decides
|
|
||||||
// whether a message is persisted. Lock kept tight, this is a hot path.
|
|
||||||
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(
|
|
||||||
"PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.",
|
|
||||||
type,
|
|
||||||
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
|
||||||
@@ -128,55 +76,17 @@ 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;
|
||||||
|
|
||||||
// v1.4.7 opt-in: renders the Honorific glow outline when the title carries
|
|
||||||
// a Glow colour. Default OFF — keeps v1.4.6 visuals untouched for users
|
|
||||||
// who don't care, and dodges the per-frame DrawList overhead on low-end
|
|
||||||
// hardware. Gradient (Color3 / GradientColourSet) is parsed but rendered
|
|
||||||
// as the primary Color until a later cycle ports the animation.
|
|
||||||
public bool ShowHonorificGlow = true;
|
|
||||||
public bool EnableAutoTellTabs = true;
|
public bool EnableAutoTellTabs = true;
|
||||||
public int AutoTellTabsLimit = 15;
|
public int AutoTellTabsLimit = 15;
|
||||||
public bool AutoTellTabsCompactDisplay = true;
|
public bool AutoTellTabsCompactDisplay;
|
||||||
public int AutoTellTabsHistoryPreload = 100;
|
public int AutoTellTabsHistoryPreload = 20;
|
||||||
|
|
||||||
// Expanded sidebar width in pixels. 44 was carried over from the v1.2.0
|
|
||||||
// icon-only layout and stayed the default long after the sidebar started
|
|
||||||
// drawing labels beside those icons, so every tab name came out clipped --
|
|
||||||
// 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)
|
||||||
{
|
{
|
||||||
@@ -197,58 +107,45 @@ 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 = true;
|
public bool MoreCompactPretty;
|
||||||
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.Right;
|
public CommandHelpSide CommandHelpSide = CommandHelpSide.None;
|
||||||
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;
|
public bool ShowTitleBar = true;
|
||||||
public bool ShowPopOutTitleBar = true;
|
public bool ShowPopOutTitleBar = 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;
|
||||||
@@ -285,53 +182,137 @@ 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;
|
||||||
|
|
||||||
// v20 fields: window visibility state, channel popout pool size and
|
public void UpdateFrom(Configuration other, bool backToOriginal)
|
||||||
// sidebar auto-switch threshold. All initializers double as the
|
{
|
||||||
// migration defaults for configs loaded at v19 or earlier.
|
if (backToOriginal)
|
||||||
// Still written on open/close, but no longer read for the start state: the
|
foreach (var tab in Tabs.Where(t => t.PopOut))
|
||||||
// window always shows on login (1.5.6 parity, MainWindow ctor). Kept for the
|
tab.PopOut = false;
|
||||||
// migration round-trip and a possible future "remember session state" opt-in.
|
|
||||||
public bool MainWindowOpen = true;
|
|
||||||
public bool SettingsWindowOpen;
|
|
||||||
public int MaxParallelPopouts = 8;
|
|
||||||
|
|
||||||
// Popout, not Sidebar: with AutoTellTabsOpenAsPopout defaulting to true, a
|
HideChat = other.HideChat;
|
||||||
// fresh install has ALWAYS opened tells in their own window. Naming that as
|
HideDuringCutscenes = other.HideDuringCutscenes;
|
||||||
// the default is what keeps a new install behaving the way it always did.
|
HideWhenNotLoggedIn = other.HideWhenNotLoggedIn;
|
||||||
public TellAutoOpenMode TellAutoOpenMode = TellAutoOpenMode.Popout;
|
HideWhenUiHidden = other.HideWhenUiHidden;
|
||||||
|
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;
|
||||||
|
|
||||||
// When true (default) the tell-auto-open router switches the active tab to the
|
// Keep live temp tabs alive across UpdateFrom — a settings save must
|
||||||
// incoming tell on every message; when false the tab is still created/revealed
|
// not destroy open tell conversations. For persistent tabs, capture
|
||||||
// with its unread badge but the active tab is left where the user is reading.
|
// the live MessageList and LastSendUnread by Identifier before the
|
||||||
public bool TellAutoOpenSwitchAlways = true;
|
// replace and restore them onto the freshly cloned tabs; new tabs
|
||||||
public int SidebarAutoSwitchThresholdPx = 800;
|
// get an empty MessageList, deleted tabs lose their history (intended).
|
||||||
|
var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
|
||||||
|
var livePersistentSession = Tabs.Where(t => !t.IsTempTab)
|
||||||
|
.ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
|
||||||
|
|
||||||
// v22 field: MainWindow layout mode (sidebar vs. horizontal top tabs).
|
Tabs = other
|
||||||
// Initializer doubles as the migration default for configs loaded at v21.
|
.Tabs.Where(t => !t.IsTempTab)
|
||||||
public MainWindowLayoutMode MainWindowLayoutMode = MainWindowLayoutMode.Sidebar;
|
.Select(t =>
|
||||||
}
|
{
|
||||||
|
var clone = t.Clone();
|
||||||
|
if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
|
||||||
|
{
|
||||||
|
clone.Messages = live.Messages;
|
||||||
|
clone.LastSendUnread = live.LastSendUnread;
|
||||||
|
}
|
||||||
|
return clone;
|
||||||
|
})
|
||||||
|
.ToList();
|
||||||
|
Tabs.AddRange(liveTempTabs);
|
||||||
|
|
||||||
[Serializable]
|
ChatTabForward = other.ChatTabForward;
|
||||||
public enum TellAutoOpenMode
|
ChatTabBackward = other.ChatTabBackward;
|
||||||
{
|
|
||||||
Off,
|
|
||||||
Sidebar,
|
|
||||||
TopTab,
|
|
||||||
Popout,
|
|
||||||
}
|
|
||||||
|
|
||||||
[Serializable]
|
PrivacyFilterEnabled = other.PrivacyFilterEnabled;
|
||||||
public enum MainWindowLayoutMode
|
PrivacyPersistChannels = [.. other.PrivacyPersistChannels];
|
||||||
{
|
PrivacyPersistUnknownChannels = other.PrivacyPersistUnknownChannels;
|
||||||
Sidebar,
|
|
||||||
TopTabs,
|
RetentionEnabled = other.RetentionEnabled;
|
||||||
|
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;
|
||||||
|
|
||||||
|
// 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;
|
||||||
|
AutoTellTabsShowGreetedToggle = other.AutoTellTabsShowGreetedToggle;
|
||||||
|
|
||||||
|
SeenPopOutInputHint = other.SeenPopOutInputHint;
|
||||||
|
PopOutInputEnabled = other.PopOutInputEnabled;
|
||||||
|
SeenPopOutHeaderHint = other.SeenPopOutHeaderHint;
|
||||||
|
AutoTellTabsOpenAsPopout = other.AutoTellTabsOpenAsPopout;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
@@ -371,6 +352,9 @@ 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 = [];
|
||||||
@@ -387,37 +371,18 @@ public class Tab
|
|||||||
public bool CanMove = true;
|
public bool CanMove = true;
|
||||||
public bool CanResize = true;
|
public bool CanResize = true;
|
||||||
|
|
||||||
// Six per-tab hide conditions used to live here. Their reader was the
|
public bool IndependentHide;
|
||||||
// pop-out window, which stopped consulting them in cf4705e; the equivalents
|
public bool HideDuringCutscenes = true;
|
||||||
// that survive are the window-level fields of the same name further up this
|
public bool HideWhenNotLoggedIn = true;
|
||||||
// file, and v1.12.0 gave every one of those a control.
|
public bool HideWhenUiHidden = true;
|
||||||
//
|
public bool HideInLoadingScreens;
|
||||||
// Per-tab was the wrong unit anyway: "hide during cutscenes" is a statement
|
public bool HideInBattle;
|
||||||
// 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 in
|
|
||||||
// v1.4.7. Pinned tabs live in their own pool (MaxPinnedTempTabs) separate
|
|
||||||
// from the AutoTellTabsLimit bucket.
|
|
||||||
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;
|
||||||
|
|
||||||
@@ -460,45 +425,6 @@ 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))
|
||||||
@@ -519,14 +445,14 @@ public class Tab
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
Unread += 1;
|
Unread += 1;
|
||||||
|
if (
|
||||||
// Stamped for every message now. The condition that used to sit here
|
message.Matches(
|
||||||
// filtered on InactivityHideChannels, a setting for the hide-when-
|
Plugin.Config.InactivityHideChannelsV2,
|
||||||
// inactive feature -- and that feature lost its reader in cf4705e. So
|
Plugin.Config.InactivityHideExtraChatAll,
|
||||||
// which tell tab the auto-tell pool drops first, which is the only
|
Plugin.Config.InactivityHideExtraChatChannels
|
||||||
// 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();
|
||||||
@@ -536,11 +462,6 @@ 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(),
|
||||||
@@ -555,16 +476,19 @@ public class Tab
|
|||||||
Opacity = Opacity,
|
Opacity = Opacity,
|
||||||
Identifier = Identifier,
|
Identifier = Identifier,
|
||||||
InputDisabled = InputDisabled,
|
InputDisabled = InputDisabled,
|
||||||
CurrentChannel = CurrentChannel.Clone(),
|
CurrentChannel = CurrentChannel,
|
||||||
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,
|
|
||||||
AllSenderMessages = AllSenderMessages,
|
AllSenderMessages = AllSenderMessages,
|
||||||
TellTarget = TellTarget.Clone(),
|
TellTarget = TellTarget.From(TellTarget),
|
||||||
EnableNotificationSound = EnableNotificationSound,
|
|
||||||
NotificationSoundId = NotificationSoundId,
|
|
||||||
IsGreeted = IsGreeted,
|
IsGreeted = IsGreeted,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -742,29 +666,6 @@ public class UsedChannel
|
|||||||
{
|
{
|
||||||
Channel = channel;
|
Channel = channel;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------
|
|
||||||
// Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
|
|
||||||
// - Deep-clone the UsedChannel so Tab.Clone() no longer shares
|
|
||||||
// channel state (incl. TellTarget) with its origin Tab. Previously
|
|
||||||
// a reference copy: PopOut and Temp tabs mutated each other.
|
|
||||||
// - Name is intentionally a reference copy (matches upstream); it
|
|
||||||
// gets reassigned on every channel switch anyway.
|
|
||||||
// TEST-MIRROR: ../../Hellion Build test/_Helpers/UsedChannelCloneTests.cs
|
|
||||||
// ---------------------------------------------------------------
|
|
||||||
public UsedChannel Clone()
|
|
||||||
{
|
|
||||||
return new UsedChannel
|
|
||||||
{
|
|
||||||
Channel = Channel,
|
|
||||||
Name = Name,
|
|
||||||
TellTarget = TellTarget?.Clone(),
|
|
||||||
|
|
||||||
UseTempChannel = UseTempChannel,
|
|
||||||
TempChannel = TempChannel,
|
|
||||||
TempTellTarget = TempTellTarget?.Clone(),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
@@ -848,27 +749,17 @@ 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
|
||||||
@@ -884,24 +775,15 @@ 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 => "한국어",
|
// LanguageOverride.Korean => "한국어 (Korean)",
|
||||||
LanguageOverride.Norwegian => "Norsk bokmål",
|
// LanguageOverride.Norwegian => "Norsk",
|
||||||
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),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -916,80 +798,17 @@ 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 => "nb",
|
// LanguageOverride.Norwegian => "no",
|
||||||
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]
|
||||||
@@ -1003,23 +822,10 @@ 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
|
||||||
{
|
{
|
||||||
@@ -1031,8 +837,6 @@ 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),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1047,10 +851,6 @@ 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),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,415 @@
|
|||||||
|
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.Log.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.Log.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.Log.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.Log.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.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
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,24 +32,14 @@ internal static class ExportFormatExt
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Serializes message snapshots to Markdown, JSON, or CSV.
|
/// <summary>
|
||||||
//
|
/// Serializes message snapshots into Markdown, JSON, or CSV. The caller is
|
||||||
// Text comes from the chunk lists, never from SenderSource/ContentSource. Those
|
/// expected to filter the input enumerable; this class only handles
|
||||||
// are raw SeStrings, and reading TextValue on one containing an auto-translate
|
/// formatting and writes to the supplied path. Sender substring filtering
|
||||||
// phrase reaches SeStringEvaluator, which asserts it is on the main thread and
|
/// happens here because it requires deserialized SeString.TextValue.
|
||||||
// throws unconditionally when a macro resolves a global number. An export runs on
|
/// </summary>
|
||||||
// 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,
|
||||||
@@ -65,83 +54,22 @@ 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;
|
||||||
|
|
||||||
// Written beside the target and moved into place at the end. A crash or
|
using var writer = new StreamWriter(path, append: false, encoding: Encoding.UTF8);
|
||||||
// an unplugged drive halfway through would otherwise leave a file that
|
return format switch
|
||||||
// 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
|
|
||||||
{
|
{
|
||||||
// Encoding.UTF8 writes a byte order mark, and that is not a
|
ExportFormat.Markdown => WriteMarkdown(writer, matching, filter),
|
||||||
// cosmetic detail here: a leading U+FEFF makes the JSON invalid for
|
ExportFormat.Json => WriteJson(writer, matching, filter),
|
||||||
// every strict parser, Python's json.load included. CSV is the one
|
ExportFormat.Csv => WriteCsv(writer, matching, filter),
|
||||||
// format that wants it -- without a BOM Excel guesses the codepage
|
_ => throw new ArgumentOutOfRangeException(nameof(format), format, null),
|
||||||
// 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) =>
|
||||||
SenderText(m).Contains(needle, StringComparison.OrdinalIgnoreCase);
|
m.SenderSource.TextValue.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,
|
||||||
@@ -170,9 +98,8 @@ internal static class MessageExporter
|
|||||||
}
|
}
|
||||||
|
|
||||||
var chatType = (ChatType)(ushort)m.Code.Type;
|
var chatType = (ChatType)(ushort)m.Code.Type;
|
||||||
var sender = SenderText(m).Trim().Trim('<', '>', '[', ']', ':').Trim();
|
var sender = m.SenderSource.TextValue.Trim().Trim('<', '>', '[', ']', ':').Trim();
|
||||||
var content = ContentText(m);
|
var content = m.ContentSource.TextValue;
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(sender))
|
if (string.IsNullOrEmpty(sender))
|
||||||
w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}");
|
w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}");
|
||||||
else
|
else
|
||||||
@@ -205,7 +132,8 @@ internal static class MessageExporter
|
|||||||
FilterDescription filter
|
FilterDescription filter
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
// Manual JSON to avoid System.Text.Json policy coupling.
|
// Manual JSON to avoid pulling in System.Text.Json policy choices.
|
||||||
|
// Output is a single object with metadata and an array of messages.
|
||||||
w.Write("{\n \"exported_at\": \"");
|
w.Write("{\n \"exported_at\": \"");
|
||||||
w.Write(DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture));
|
w.Write(DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture));
|
||||||
w.Write("\",\n \"plugin\": \"Hellion Chat\",\n");
|
w.Write("\",\n \"plugin\": \"Hellion Chat\",\n");
|
||||||
@@ -246,17 +174,12 @@ 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}\"");
|
||||||
// Cast, not interpolate. These are XivChatRelationKind, and string
|
w.Write($",\"source_kind\":{m.Code.Source}");
|
||||||
// interpolation of an enum writes the member name -- so every
|
w.Write($",\"target_kind\":{m.Code.Target}");
|
||||||
// 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(SenderText(m))}");
|
w.Write($",\"sender\":{JsonString(m.SenderSource.TextValue)}");
|
||||||
w.Write($",\"content\":{JsonString(ContentText(m))}");
|
w.Write($",\"content\":{JsonString(m.ContentSource.TextValue)}");
|
||||||
w.Write("}");
|
w.Write("}");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -271,7 +194,7 @@ internal static class MessageExporter
|
|||||||
FilterDescription filter
|
FilterDescription filter
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
// Header always written so empty exports remain importable.
|
// Header line always written so empty exports are still importable.
|
||||||
w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId");
|
w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId");
|
||||||
var count = 0;
|
var count = 0;
|
||||||
foreach (var m in messages)
|
foreach (var m in messages)
|
||||||
@@ -284,9 +207,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(SenderText(m)));
|
w.Write(CsvString(m.SenderSource.TextValue));
|
||||||
w.Write(',');
|
w.Write(',');
|
||||||
w.Write(CsvString(ContentText(m)));
|
w.Write(CsvString(m.ContentSource.TextValue));
|
||||||
w.Write(',');
|
w.Write(',');
|
||||||
w.Write(m.Receiver);
|
w.Write(m.Receiver);
|
||||||
w.Write(',');
|
w.Write(',');
|
||||||
@@ -339,17 +262,8 @@ 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("\"", "\"\"") + "\"";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+127
-441
@@ -1,110 +1,26 @@
|
|||||||
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;
|
||||||
|
|
||||||
// Two LogProxy sites live in static methods (TryGetBundledFontBytes,
|
public class FontManager
|
||||||
// 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
|
|
||||||
{
|
{
|
||||||
private readonly IDalamudPluginInterface _pluginInterface;
|
internal IFontHandle Axis = null!;
|
||||||
|
internal IFontHandle AxisItalic = null!;
|
||||||
|
|
||||||
internal IFontHandle Axis { get; init; }
|
internal IFontHandle RegularFont = null!;
|
||||||
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;
|
||||||
|
|
||||||
// v1.13.0: one handle per type role that needs a face of its own. Sender
|
internal IFontHandle FontAwesome = null!;
|
||||||
// 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,
|
||||||
@@ -125,289 +41,28 @@ public sealed class FontManager : IDisposable
|
|||||||
90f,
|
90f,
|
||||||
];
|
];
|
||||||
|
|
||||||
// Bundled UI font bytes (Inter Light, OFL-1.1); lazily loaded from manifest resources
|
// Hellion font bytes (Exo 2, OFL-1.1); lazily loaded from manifest resources
|
||||||
private static byte[]? BundledFontBytes;
|
private static byte[]? HellionFontBytes;
|
||||||
|
|
||||||
public FontManager(IDalamudPluginInterface pluginInterface)
|
private static byte[] GetHellionFontBytes()
|
||||||
{
|
{
|
||||||
_pluginInterface = pluginInterface;
|
if (HellionFontBytes is not null)
|
||||||
SetUpRanges();
|
return HellionFontBytes;
|
||||||
|
|
||||||
var atlas = _pluginInterface.UiBuilder.FontAtlas;
|
using var stream =
|
||||||
|
typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
|
||||||
using (atlas.SuppressAutoRebuild())
|
?? throw new FileNotFoundException(
|
||||||
{
|
"Hellion font resource not embedded in the assembly"
|
||||||
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(
|
|
||||||
"Inter-Light.ttf"
|
|
||||||
);
|
|
||||||
if (stream is null)
|
|
||||||
{
|
|
||||||
Plugin.LogProxy.Warning(
|
|
||||||
"Bundled Inter Light font resource missing, falling back to system default font."
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
using var ms = new MemoryStream();
|
using var ms = new MemoryStream();
|
||||||
stream.CopyTo(ms);
|
stream.CopyTo(ms);
|
||||||
BundledFontBytes = ms.ToArray();
|
HellionFontBytes = ms.ToArray();
|
||||||
return BundledFontBytes;
|
return HellionFontBytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe void SetUpRanges()
|
private unsafe void SetUpRanges()
|
||||||
{
|
{
|
||||||
ushort[] BuildRange(
|
ushort[] BuildRange(IReadOnlyList<ushort>? chars, params nint[] ranges)
|
||||||
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)
|
||||||
@@ -425,83 +80,124 @@ public sealed class FontManager : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Common extras (Axis ingame glyphs, endonyms, enclosed alphanumerics)
|
// Ingame supported ranges
|
||||||
// belong to the primary/Japanese ranges only. The trimmed CJK fallback
|
var reader = new FdtReader(Plugin.DataManager.GetFile("common/font/axis_12.fdt")!.Data);
|
||||||
// skips them so it stays a pure Hangul/Simplified-Han remainder and
|
foreach (var c in reader.Glyphs)
|
||||||
// does not re-merge the Default-block work the global font already did.
|
builder.AddChar(c.Char);
|
||||||
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);
|
|
||||||
|
|
||||||
// French
|
// various symbols
|
||||||
// Romanian
|
// French
|
||||||
builder.AddText("Œœ");
|
// Romanian
|
||||||
builder.AddText("ĂăÂâÎîȘșȚț");
|
// builder.AddText("←→↑↓《》■※☀★★☆♥♡ヅツッシ☀☁☂℃℉°♀♂♠♣♦♣♧®©™€$£♯♭♪✓√◎◆◇♦■□〇●△▽▼▲‹›≤≥<«“”─\~");
|
||||||
|
builder.AddText("Œœ");
|
||||||
|
builder.AddText("ĂăÂâÎîȘșȚț");
|
||||||
|
|
||||||
// v1.5.3: language-dropdown endonyms. The dropdown renders
|
// "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460
|
||||||
// with the currently active font range; without these glyphs
|
for (var i = 0x2460; i <= 0x24B5; i++)
|
||||||
// a user on an English UI cannot read non-Latin language names
|
builder.AddChar((char)i);
|
||||||
// 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))
|
||||||
if (!Plugin.Config.ExtraGlyphRanges.HasFlag(extraRange))
|
ranges.Add(extraRange.Range());
|
||||||
continue;
|
|
||||||
|
|
||||||
// LatinExtended and Greek use AddChar pairs because they have no
|
Ranges = BuildRange(null, ranges.ToArray());
|
||||||
// built-in ImGui range helper; everything else points to a native
|
JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges);
|
||||||
// ImGui glyph-range table.
|
}
|
||||||
switch (extraRange)
|
|
||||||
{
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ranges = BuildRange(
|
// CPU-bound build offloaded to Task.Run; runs parallel with theme init
|
||||||
customChars.Count > 0 ? customChars : null,
|
public async Task BuildFontsAsync(CancellationToken cancellationToken)
|
||||||
includeCommonExtras: true,
|
{
|
||||||
ranges.ToArray()
|
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,
|
||||||
|
}
|
||||||
);
|
);
|
||||||
JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges, includeCommonExtras: true);
|
|
||||||
|
|
||||||
// The fallback gets only the trimmed Hangul/Simplified-Han remainder.
|
FontAwesome = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
|
||||||
// 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.
|
e.OnPreBuild(tk =>
|
||||||
CjkFallbackGlyphRange = BuildRange(CjkFallbackRange.Pairs, includeCommonExtras: false);
|
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 };
|
||||||
|
config.MergeFont = Plugin.Config.UseHellionFont
|
||||||
|
? tk.AddFontFromMemory(GetHellionFontBytes(), 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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add font with fallback to NotoSansCjkRegular if unavailable
|
// Add font with fallback to NotoSansCjkRegular if unavailable
|
||||||
@@ -517,21 +213,11 @@ public sealed class FontManager : IDisposable
|
|||||||
return fontId.AddToBuildToolkit(tk, config);
|
return fontId.AddToBuildToolkit(tk, config);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
when (e
|
when (e is FileNotFoundException or DirectoryNotFoundException or IOException)
|
||||||
is FileNotFoundException
|
|
||||||
or DirectoryNotFoundException
|
|
||||||
or IOException
|
|
||||||
or InvalidOperationException
|
|
||||||
or ArgumentException
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
// Atlas-toolkit throws span IO and validation failures; routing
|
Plugin.Log.Warning(
|
||||||
// the wider set through the fallback keeps a corrupt font config
|
|
||||||
// from taking down the whole atlas build.
|
|
||||||
Plugin.LogProxy.Warning(
|
|
||||||
e,
|
e,
|
||||||
$"Configured {slot} font failed to load ({e.GetType().Name}), "
|
$"Configured {slot} font unavailable, falling back to NotoSansCjkRegular"
|
||||||
+ "falling back to NotoSansCjkRegular"
|
|
||||||
);
|
);
|
||||||
var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular);
|
var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular);
|
||||||
return fallback.AddToBuildToolkit(tk, config);
|
return fallback.AddToBuildToolkit(tk, config);
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
+111
-101
@@ -19,7 +19,6 @@ 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;
|
||||||
@@ -99,12 +98,9 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
private long LastPlayerNameDisplayTypeRefresh;
|
private long LastPlayerNameDisplayTypeRefresh;
|
||||||
private PlayerNameDisplayType CurrentPlayerNameDisplayType = PlayerNameDisplayType.FullName;
|
private PlayerNameDisplayType CurrentPlayerNameDisplayType = PlayerNameDisplayType.FullName;
|
||||||
|
|
||||||
private readonly ILogger<Chat> _logger;
|
public Chat(Plugin plugin)
|
||||||
|
|
||||||
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();
|
||||||
@@ -178,7 +174,8 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
internal static void RotateCrossLinkshellHistory(RotateMode mode) =>
|
internal static void RotateCrossLinkshellHistory(RotateMode mode) =>
|
||||||
UIModule.Instance()->RotateCrossLinkshellHistory(GetRotateIdx(mode));
|
UIModule.Instance()->RotateCrossLinkshellHistory(GetRotateIdx(mode));
|
||||||
|
|
||||||
// Look up a channel's user-defined color, returns null if 0
|
// This function looks up a channel's user-defined color.
|
||||||
|
// If this function ever returns 0, it returns null instead.
|
||||||
internal uint? GetChannelColor(ChatType type)
|
internal uint? GetChannelColor(ChatType type)
|
||||||
{
|
{
|
||||||
var parent = type.Parent();
|
var parent = type.Parent();
|
||||||
@@ -218,7 +215,8 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
|
|
||||||
if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null)
|
if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null)
|
||||||
{
|
{
|
||||||
// Capture the just-typed character input
|
// FIXME: this whole system sucks
|
||||||
|
// FIXME v2: I hate everything about this, but it works
|
||||||
Plugin.Framework.RunOnTick(() =>
|
Plugin.Framework.RunOnTick(() =>
|
||||||
{
|
{
|
||||||
string? input = null;
|
string? input = null;
|
||||||
@@ -232,13 +230,15 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
if (c != '\0' && !char.IsControl(c))
|
if (c != '\0' && !char.IsControl(c))
|
||||||
input = c.ToString();
|
input = c.ToString();
|
||||||
|
|
||||||
// Seed the just-typed character into our input field and focus it, the
|
try
|
||||||
// same InputBar.AppendPending + Activate prefill path inventory item-links
|
|
||||||
// use. Prefill only, deliberately: no tab switch.
|
|
||||||
if (input != null)
|
|
||||||
{
|
{
|
||||||
Plugin.InputBar.AppendPending(input);
|
Plugin.ChatLogWindow.Activated(
|
||||||
Plugin.InputBar.Activate = true;
|
new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Plugin.Log.Error(ex, "Error in chat Activated event");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -253,15 +253,30 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
addIfNotPresent = add;
|
addIfNotPresent = add;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Route the addIfNotPresent token into the InputBar so inventory
|
try
|
||||||
// right-click "Link item" reaches our input field instead of being lost.
|
|
||||||
if (addIfNotPresent != null && !Plugin.InputBar.PendingMessage.Contains(addIfNotPresent))
|
|
||||||
{
|
{
|
||||||
Plugin.InputBar.AppendPending(addIfNotPresent);
|
// We already called this function once, so we skip the duplicated call
|
||||||
Plugin.InputBar.Activate = true;
|
// Also return the original value here so that vanilla chat receives all information
|
||||||
|
if (Plugin.ChatLogWindow.TellSpecial)
|
||||||
|
{
|
||||||
|
Plugin.Log.Information("Return early to prevent duplicated call...");
|
||||||
|
return ChatLogRefreshHook!.Original(log, eventId, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
Plugin.ChatLogWindow.Activated(
|
||||||
|
new ChatActivatedArgs(new ChannelSwitchInfo(null))
|
||||||
|
{
|
||||||
|
AddIfNotPresent = addIfNotPresent,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Plugin.Log.Error(ex, "Error in chat Activated event");
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1; // Prevent vanilla chat log from gaining focus
|
// prevent the game from focusing the chat log
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent)
|
private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent)
|
||||||
@@ -291,7 +306,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;
|
||||||
_logger.LogDebug($"Detected tell target '[redacted]'@{worldId}");
|
Plugin.Log.Debug($"Detected tell target '[redacted]'@{worldId}");
|
||||||
}
|
}
|
||||||
|
|
||||||
Plugin.CurrentTab.CurrentChannel = new UsedChannel
|
Plugin.CurrentTab.CurrentChannel = new UsedChannel
|
||||||
@@ -317,30 +332,6 @@ 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,
|
||||||
@@ -354,14 +345,28 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
{
|
{
|
||||||
if (playerName != null)
|
if (playerName != null)
|
||||||
{
|
{
|
||||||
// Right-click -> Send Tell: prefill our input the same way our own
|
try
|
||||||
// "Send Tell" payload menu does (PayloadHandler), then focus. Prefill
|
{
|
||||||
// only, deliberately: no tab switch, no ChatActivatedArgs revival.
|
var target = new TellTarget(
|
||||||
// The game supplies worldName here, so no sheet lookup.
|
playerName->ToString(),
|
||||||
PrefillTellInput(
|
worldId,
|
||||||
playerName->ToString(),
|
contentId,
|
||||||
worldName != null ? worldName->ToString() : null
|
(TellReason)reason
|
||||||
);
|
);
|
||||||
|
Plugin.ChatLogWindow.Activated(
|
||||||
|
new ChatActivatedArgs(
|
||||||
|
new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)
|
||||||
|
)
|
||||||
|
{
|
||||||
|
TellReason = (TellReason)reason,
|
||||||
|
TellTarget = target,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Plugin.Log.Error(ex, "Error in chat Activated event");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return SetChatLogTellTargetHook!.Original(
|
return SetChatLogTellTargetHook!.Original(
|
||||||
@@ -391,13 +396,27 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
|
|
||||||
if (playerName != null)
|
if (playerName != null)
|
||||||
{
|
{
|
||||||
// In-foray right-click -> Send Tell: same prefill path as the non-foray
|
try
|
||||||
// tell. The foray-specific TellSpecial channel routing stays deferred
|
{
|
||||||
// (v1.8.1, SetEurekaTellChannel) -- prefill only here as well.
|
var target = new TellTarget(
|
||||||
PrefillTellInput(
|
playerName->ToString(),
|
||||||
playerName->ToString(),
|
worldId,
|
||||||
worldName != null ? worldName->ToString() : null
|
contentId,
|
||||||
);
|
(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.Log.Error(ex, "Error in chat Activated event");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ContextMenuTellInForayHook!.Original(
|
ContextMenuTellInForayHook!.Original(
|
||||||
@@ -411,24 +430,19 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------
|
/// <summary>
|
||||||
// Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
|
/// Returns true if the channel is any non-linkshell channel, or if the
|
||||||
// - Renamed ValidAnyLinkshell -> IsChannelOrExistingLinkshell. The
|
/// linkshell actually exists.
|
||||||
// name now states intent: returns true for any non-linkshell
|
/// </summary>
|
||||||
// channel, or a linkshell index that actually exists.
|
internal static bool ValidAnyLinkshell(InputChannel channel)
|
||||||
// ---------------------------------------------------------------
|
|
||||||
internal static bool IsChannelOrExistingLinkshell(InputChannel channel)
|
|
||||||
{
|
{
|
||||||
var idx = channel.LinkshellIndex();
|
var idx = channel.LinkshellIndex();
|
||||||
if (idx == uint.MaxValue || channel.IsExtraChatLinkshell())
|
if (idx == uint.MaxValue || channel.IsExtraChatLinkshell())
|
||||||
return true;
|
return true;
|
||||||
|
if (channel.IsLinkshell() && ValidLinkshell(idx))
|
||||||
if (channel.IsLinkshell())
|
return true;
|
||||||
return ValidLinkshell(idx);
|
if (channel.IsCrossLinkshell() && ValidCrossLinkshell(idx))
|
||||||
|
return true;
|
||||||
if (channel.IsCrossLinkshell())
|
|
||||||
return ValidCrossLinkshell(idx);
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -451,17 +465,6 @@ 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)
|
||||||
@@ -474,7 +477,8 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
_ => 1,
|
_ => 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
for (var i = 0; i < 8; i++) // Find valid linkshell within 8 iterations
|
// Iterate up to 8 times to find a valid linkshell.
|
||||||
|
for (var i = 0; i < 8; i++)
|
||||||
{
|
{
|
||||||
currentIndex = (uint)((8 + currentIndex + delta) % 8);
|
currentIndex = (uint)((8 + currentIndex + delta) % 8);
|
||||||
if (validFn(currentIndex))
|
if (validFn(currentIndex))
|
||||||
@@ -520,7 +524,7 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
);
|
);
|
||||||
// RotateLinkshell returns null when no valid linkshell is found within 8 iterations.
|
// RotateLinkshell returns null when no valid linkshell is found within 8 iterations.
|
||||||
// Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic.
|
// Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic.
|
||||||
return idx is null ? null : channel + idx.Value; // null if not found, otherwise new channel
|
return idx is null ? null : channel + idx.Value;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return channel;
|
return channel;
|
||||||
@@ -529,7 +533,11 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
|
|
||||||
internal void SetChannel(InputChannel channel, TellTarget? tellTarget = null)
|
internal void SetChannel(InputChannel channel, TellTarget? tellTarget = null)
|
||||||
{
|
{
|
||||||
// Ignore ExtraChat linkshells (use ChatLogWindow.SetChannel() instead)
|
// ExtraChat linkshells aren't supported in game so we never want to
|
||||||
|
// call the ChangeChatChannel function with them.
|
||||||
|
//
|
||||||
|
// Callers should call ChatLogWindow.SetChannel() which handles
|
||||||
|
// ExtraChat channels
|
||||||
if (channel.IsExtraChatLinkshell())
|
if (channel.IsExtraChatLinkshell())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -538,17 +546,12 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
if (idx == uint.MaxValue)
|
if (idx == uint.MaxValue)
|
||||||
idx = 0;
|
idx = 0;
|
||||||
|
|
||||||
// ---------------------------------------------------------------
|
if (!ValidAnyLinkshell(channel))
|
||||||
// Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
|
return;
|
||||||
// - Wrap ChangeChatChannel in the validity check instead of
|
|
||||||
// early-returning. The previous early return skipped Dtor and
|
|
||||||
// leaked the native Utf8String allocated a few lines above.
|
|
||||||
// ---------------------------------------------------------------
|
|
||||||
if (IsChannelOrExistingLinkshell(channel))
|
|
||||||
RaptureShellModule
|
|
||||||
.Instance()
|
|
||||||
->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
|
|
||||||
|
|
||||||
|
RaptureShellModule
|
||||||
|
.Instance()
|
||||||
|
->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
|
||||||
target->Dtor(true);
|
target->Dtor(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -562,11 +565,15 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
bool setChatType
|
bool setChatType
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
// param6 is 0 for contentId and 1 for objectId
|
||||||
|
// param7 is always 0 ?
|
||||||
|
|
||||||
if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
|
if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
|
||||||
Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
|
Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
|
||||||
|
|
||||||
// Send tell via CommandInner later and let the game handle it.
|
// Send tell via CommandInner later and let the game handle it
|
||||||
// TellSpecial gate is offline until the new chat layer reads it.
|
// Only works because we use the SetTellTargetInForay function to set all required information
|
||||||
|
Plugin.ChatLogWindow.TellSpecial = true;
|
||||||
|
|
||||||
var utfName = Utf8String.FromString(name);
|
var utfName = Utf8String.FromString(name);
|
||||||
var utfWorld = Utf8String.FromString(worldName);
|
var utfWorld = Utf8String.FromString(worldName);
|
||||||
@@ -622,7 +629,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);
|
||||||
_logger.LogWarning(
|
Plugin.Log.Warning(
|
||||||
"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;
|
||||||
@@ -735,7 +742,10 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
|
|
||||||
internal bool CheckHideFlags()
|
internal bool CheckHideFlags()
|
||||||
{
|
{
|
||||||
// Only hide chat in cutscene when vanilla chat would also be hidden
|
// Only hide the chat in a cutscene when the vanilla chat would've
|
||||||
|
// also been hidden. This prevents Chat 2 from hiding for a split
|
||||||
|
// second before the cutscene actually starts, because the game sets
|
||||||
|
// the cutscene conditions before processing the skip.
|
||||||
var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
|
var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
|
||||||
return raptureAtkUnitManager == null
|
return raptureAtkUnitManager == null
|
||||||
|| raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
|
|| raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
|
||||||
|
|||||||
@@ -15,10 +15,17 @@ public unsafe class ChatBox
|
|||||||
mes->Dtor(true);
|
mes->Dtor(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SendMessage(string message) => SendMessageUnsafe(ValidateMessage(message));
|
public static void SendMessage(string message)
|
||||||
|
{
|
||||||
|
var bytes = ValidateMessage(message);
|
||||||
|
SendMessageUnsafe(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
// sanitiserOverride allows xUnit to bypass Utf8String->SanitizeString (game memory only).
|
// Validation split out so the deterministic checks (UTF-8 length, sanitise
|
||||||
// Returns encoded bytes so SendMessage avoids a second GetBytes call.
|
// round-trip) can run in xUnit without ClientStructs game memory. The
|
||||||
|
// sanitiser is injectable so tests can pin throw behaviour without invoking
|
||||||
|
// Utf8String->SanitizeString, which only resolves in-process. Returns the
|
||||||
|
// already-encoded bytes so SendMessage doesn't pay GetBytes twice.
|
||||||
// TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
|
// TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
|
||||||
internal static byte[] ValidateMessage(
|
internal static byte[] ValidateMessage(
|
||||||
string message,
|
string message,
|
||||||
@@ -42,9 +49,11 @@ public unsafe class ChatBox
|
|||||||
private static string SanitiseText(string text)
|
private static string SanitiseText(string text)
|
||||||
{
|
{
|
||||||
var uText = Utf8String.FromString(text);
|
var uText = Utf8String.FromString(text);
|
||||||
|
|
||||||
uText->SanitizeString((AllowedEntities)0x27F);
|
uText->SanitizeString((AllowedEntities)0x27F);
|
||||||
var sanitised = uText->ToString();
|
var sanitised = uText->ToString();
|
||||||
uText->Dtor(true);
|
uText->Dtor(true);
|
||||||
|
|
||||||
return sanitised;
|
return sanitised;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ 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;
|
||||||
@@ -38,22 +37,17 @@ 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(
|
internal GameFunctions(Plugin plugin)
|
||||||
Plugin plugin,
|
|
||||||
ILogger<GameFunctions> logger,
|
|
||||||
ILoggerFactory loggerFactory
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
Plugin = plugin;
|
Plugin = plugin;
|
||||||
_logger = logger;
|
KeybindManager = new KeybindManager(plugin);
|
||||||
KeybindManager = new KeybindManager(plugin, loggerFactory.CreateLogger<KeybindManager>());
|
Chat = new Chat(Plugin);
|
||||||
Chat = new Chat(Plugin, loggerFactory.CreateLogger<Chat>());
|
|
||||||
|
|
||||||
Plugin.GameInteropProvider.InitializeFromAttributes(this);
|
Plugin.GameInteropProvider.InitializeFromAttributes(this);
|
||||||
|
|
||||||
ResolveTextCommandPlaceholderHook?.Enable();
|
ResolveTextCommandPlaceholderHook?.Enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,24 +55,36 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
{
|
{
|
||||||
Chat.Dispose();
|
Chat.Dispose();
|
||||||
KeybindManager.Dispose();
|
KeybindManager.Dispose();
|
||||||
|
|
||||||
ResolveTextCommandPlaceholderHook?.Dispose();
|
ResolveTextCommandPlaceholderHook?.Dispose();
|
||||||
|
|
||||||
Marshal.FreeHGlobal(PlaceholderNamePtr);
|
Marshal.FreeHGlobal(PlaceholderNamePtr);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void SendFriendRequest(string name, ushort world) =>
|
internal void SendFriendRequest(string name, ushort world)
|
||||||
|
{
|
||||||
ListCommand(name, world, "friendlist");
|
ListCommand(name, world, "friendlist");
|
||||||
|
}
|
||||||
|
|
||||||
internal void AddToBlacklist(string name, ushort world) => ListCommand(name, world, "blist");
|
internal void AddToBlacklist(string name, ushort world)
|
||||||
|
{
|
||||||
|
ListCommand(name, world, "blist");
|
||||||
|
}
|
||||||
|
|
||||||
internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId) =>
|
internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId)
|
||||||
|
{
|
||||||
AgentMutelist.Instance()->Add(accountId, contentId, name, worldId);
|
AgentMutelist.Instance()->Add(accountId, contentId, name, worldId);
|
||||||
|
}
|
||||||
|
|
||||||
internal void AddToTermsList(SeString content) =>
|
internal void AddToTermsList(SeString content)
|
||||||
|
{
|
||||||
AgentTermFilter.Instance()->OpenNewFilterWindow(content.EncodeWithNullTerminator());
|
AgentTermFilter.Instance()->OpenNewFilterWindow(content.EncodeWithNullTerminator());
|
||||||
|
}
|
||||||
|
|
||||||
private void ListCommand(string name, ushort world, string commandName)
|
private void ListCommand(string name, ushort world, string commandName)
|
||||||
{
|
{
|
||||||
var worldRow = Sheets.WorldSheet.GetRow(world);
|
var worldRow = Sheets.WorldSheet.GetRow(world);
|
||||||
|
|
||||||
ReplacementName = $"{name}@{worldRow.Name.ToString()}";
|
ReplacementName = $"{name}@{worldRow.Name.ToString()}";
|
||||||
ChatBox.SendMessage($"/{commandName} add {Placeholder}");
|
ChatBox.SendMessage($"/{commandName} add {Placeholder}");
|
||||||
}
|
}
|
||||||
@@ -102,6 +108,7 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
{
|
{
|
||||||
for (var i = 0; i < 4; i++)
|
for (var i = 0; i < 4; i++)
|
||||||
SetAddonInteractable($"ChatLogPanel_{i}", interactable);
|
SetAddonInteractable($"ChatLogPanel_{i}", interactable);
|
||||||
|
|
||||||
SetAddonInteractable("ChatLog", interactable);
|
SetAddonInteractable("ChatLog", interactable);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,6 +124,7 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
var agent = AgentItemDetail.Instance();
|
var agent = AgentItemDetail.Instance();
|
||||||
var addon = GetAddon<AtkUnitBase>("ItemDetail");
|
var addon = GetAddon<AtkUnitBase>("ItemDetail");
|
||||||
|
|
||||||
|
// atkStage ain't gonna be null or we have bigger problems
|
||||||
if (agent == null || addon == null)
|
if (agent == null || addon == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -125,19 +133,23 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
agent->Index = 0;
|
agent->Index = 0;
|
||||||
agent->Flag1 &= 0xEF;
|
agent->Flag1 &= 0xEF;
|
||||||
agent->ItemId = id;
|
agent->ItemId = id;
|
||||||
|
// agent->Flag2 = 1;
|
||||||
// TODO: Revert when CS offset lands in a release build.
|
// agent->Flag3 = 0;
|
||||||
|
// TODO: Revert whenever CS is merged
|
||||||
*(byte*)((nint)agent + 0x21A) = 1;
|
*(byte*)((nint)agent + 0x21A) = 1;
|
||||||
*(byte*)((nint)agent + 0x21E) = 0;
|
*(byte*)((nint)agent + 0x21E) = 0;
|
||||||
|
|
||||||
|
// This just probably needs to be set
|
||||||
agent->AddonId = addon->Id;
|
agent->AddonId = addon->Id;
|
||||||
|
|
||||||
|
// Skips early return
|
||||||
atkStage->TooltipManager.TooltipType |= 2;
|
atkStage->TooltipManager.TooltipType |= 2;
|
||||||
addon->Show(false, 15);
|
addon->Show(false, 15);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static void CloseItemTooltip()
|
internal static void CloseItemTooltip()
|
||||||
{
|
{
|
||||||
// Hide addon first to suppress the "addon close" sound.
|
// hide addon first to prevent the "addon close" sound
|
||||||
var addon = GetAddon<AtkUnitBase>("ItemDetail");
|
var addon = GetAddon<AtkUnitBase>("ItemDetail");
|
||||||
if (addon != null)
|
if (addon != null)
|
||||||
addon->Hide(true, false, 0);
|
addon->Hide(true, false, 0);
|
||||||
@@ -155,7 +167,7 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
|
|
||||||
internal static void OpenPartyFinder()
|
internal static void OpenPartyFinder()
|
||||||
{
|
{
|
||||||
// 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
|
// this whole method: 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
|
||||||
var lfg = AgentLookingForGroup.Instance();
|
var lfg = AgentLookingForGroup.Instance();
|
||||||
if (lfg->IsAgentActive())
|
if (lfg->IsAgentActive())
|
||||||
{
|
{
|
||||||
@@ -176,10 +188,15 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static bool IsMentor() => PlayerState.Instance()->IsMentor();
|
internal static bool IsMentor()
|
||||||
|
{
|
||||||
|
return PlayerState.Instance()->IsMentor();
|
||||||
|
}
|
||||||
|
|
||||||
internal static InfoProxyCommonList.CharacterData[] GetFriends() =>
|
internal static InfoProxyCommonList.CharacterData[] GetFriends()
|
||||||
InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
|
{
|
||||||
|
return InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
internal static void OpenQuestLog(RowRef<Quest> quest)
|
internal static void OpenQuestLog(RowRef<Quest> quest)
|
||||||
{
|
{
|
||||||
@@ -206,12 +223,20 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
AgentQuestJournal.Instance()->OpenForQuest(questId, 1);
|
AgentQuestJournal.Instance()->OpenForQuest(questId, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static void OpenPartyFinder(uint id) =>
|
internal static void OpenPartyFinder(uint id)
|
||||||
|
{
|
||||||
AgentLookingForGroup.Instance()->OpenListing(id);
|
AgentLookingForGroup.Instance()->OpenListing(id);
|
||||||
|
}
|
||||||
|
|
||||||
internal static void OpenAchievement(uint id) => AgentAchievement.Instance()->OpenById(id);
|
internal static void OpenAchievement(uint id)
|
||||||
|
{
|
||||||
|
AgentAchievement.Instance()->OpenById(id);
|
||||||
|
}
|
||||||
|
|
||||||
internal static bool IsInInstance() => Plugin.Condition[ConditionFlag.BoundByDuty56];
|
internal static bool IsInInstance()
|
||||||
|
{
|
||||||
|
return Plugin.Condition[ConditionFlag.BoundByDuty56];
|
||||||
|
}
|
||||||
|
|
||||||
internal static bool TryOpenAdventurerPlate(ulong playerId)
|
internal static bool TryOpenAdventurerPlate(ulong playerId)
|
||||||
{
|
{
|
||||||
@@ -222,8 +247,7 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
// Static method, no instance _logger reachable here.
|
Plugin.Log.Warning(e, "Unable to open adventurer plate");
|
||||||
Plugin.LogProxy.Warning(e, "Unable to open adventurer plate");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -231,7 +255,8 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
internal static void ClickNoviceNetworkButton()
|
internal static void ClickNoviceNetworkButton()
|
||||||
{
|
{
|
||||||
var agent = AgentChatLog.Instance();
|
var agent = AgentChatLog.Instance();
|
||||||
var value = new AtkValue { Type = ValueType.Int, Int = 3 }; // case 3
|
// case 3
|
||||||
|
var value = new AtkValue { Type = ValueType.Int, Int = 3 };
|
||||||
var result = 0;
|
var result = 0;
|
||||||
var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*)
|
var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*)
|
||||||
agent->VirtualTable;
|
agent->VirtualTable;
|
||||||
@@ -250,8 +275,9 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
byte a4
|
byte a4
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
// Hook field is nullable due to the Signature attribute, but will never
|
// The detour is only invoked through the hook, so the hook should
|
||||||
// be null during normal execution; guard covers the teardown race only.
|
// never be null here, but the nullable field declaration forces us
|
||||||
|
// to handle the theoretical race during teardown.
|
||||||
if (ResolveTextCommandPlaceholderHook is null)
|
if (ResolveTextCommandPlaceholderHook is null)
|
||||||
return nint.Zero;
|
return nint.Zero;
|
||||||
|
|
||||||
@@ -259,11 +285,13 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
if (ReplacementName == null || placeholder != Placeholder)
|
if (ReplacementName == null || placeholder != Placeholder)
|
||||||
return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
|
return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
|
||||||
|
|
||||||
// Guard against a malformed ReplacementName overflowing the 128-byte buffer.
|
// The fixed buffer is 128 bytes; UTF-8 + null-terminator must fit.
|
||||||
|
// FFXIV player names plus an @World suffix should never approach this
|
||||||
|
// limit, but a malformed ReplacementName must not overflow the buffer.
|
||||||
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
|
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
|
||||||
if (byteCount >= PlaceholderBufferSize)
|
if (byteCount >= PlaceholderBufferSize)
|
||||||
{
|
{
|
||||||
_logger.LogWarning(
|
Plugin.Log.Warning(
|
||||||
$"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;
|
||||||
@@ -272,6 +300,7 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
|
|
||||||
MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
|
MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
|
||||||
ReplacementName = null;
|
ReplacementName = null;
|
||||||
|
|
||||||
return PlaceholderNamePtr;
|
return PlaceholderNamePtr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ 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;
|
||||||
@@ -308,12 +306,9 @@ internal unsafe class KeybindManager : IDisposable
|
|||||||
// VirtualKey.OEM_CLEAR,
|
// VirtualKey.OEM_CLEAR,
|
||||||
};
|
};
|
||||||
|
|
||||||
private readonly ILogger<KeybindManager> _logger;
|
internal KeybindManager(Plugin plugin)
|
||||||
|
|
||||||
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.
|
||||||
@@ -505,188 +500,33 @@ 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
|
||||||
{
|
{
|
||||||
if (info.Channel is { } channel && info.Rotate == RotateMode.None)
|
TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null;
|
||||||
{
|
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)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Keybind routing failed for channel {Channel}", info.Channel);
|
Plugin.Log.Error(ex, "Error in chat Activated event");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Resolve which chat surface a keybind action targets: the open pop-out whose
|
// v0.6.0 — central dispatch for ChatTabForward/Backward. If a pop-out
|
||||||
// input currently has focus, otherwise the main window. Both paths share it so a
|
// window currently has its compact input focused, the keybind is
|
||||||
// channel-switch/REPLY/prefill follows the surface the user is typing in. The
|
// forwarded into that pop-out's ChatInputBar so the user navigates
|
||||||
// returned tab is that surface's bound tab (pop-out: Bound; main: ActiveTab).
|
// tabs in the window they are typing in. Otherwise the main window
|
||||||
// Null tab => skip the tab-write (early-load window where no tab exists yet).
|
// handles it (= v0.5.x behavior).
|
||||||
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)
|
||||||
{
|
{
|
||||||
Plugin.Instance.MainWindow?.ChangeTabDelta(delta);
|
foreach (var popout in Plugin.ChatLogWindow.ActivePopouts)
|
||||||
|
{
|
||||||
|
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)
|
||||||
|
|||||||
@@ -40,11 +40,5 @@ public class TellTarget
|
|||||||
|
|
||||||
public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);
|
public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);
|
||||||
|
|
||||||
// ---------------------------------------------------------------
|
public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason);
|
||||||
// Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
|
|
||||||
// - Replaced static From(t) with an instance-style Clone() so call
|
|
||||||
// sites read like a copy operation, not a factory.
|
|
||||||
// TEST-MIRROR: ../../../Hellion Build test/_Helpers/TellTargetCloneTests.cs
|
|
||||||
// ---------------------------------------------------------------
|
|
||||||
public TellTarget Clone() => new(Name, World, ContentId, Reason);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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>2.0.5</Version>
|
<Version>1.4.3</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,24 +13,11 @@
|
|||||||
|
|
||||||
<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.7, 4.0.0)" />
|
<PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" />
|
||||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
|
||||||
<!-- v1.5.0 DI-container foundation; matches Lightless pin (Hosting 10.0.7) -->
|
|
||||||
<PackageReference
|
|
||||||
Include="Microsoft.Extensions.DependencyInjection"
|
|
||||||
Version="[10.0.7, 11.0.0)"
|
|
||||||
/>
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="[10.0.7, 11.0.0)" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="[10.0.7, 11.0.0)" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Options" Version="[10.0.7, 11.0.0)" />
|
|
||||||
<!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
|
<!-- 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>
|
||||||
@@ -55,39 +42,22 @@
|
|||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Embedded resources: bundled UI font (Inter Light, OFL-1.1) + manifest resource -->
|
<!-- Embedded resources: Hellion font (Exo 2, OFL-1.1) + manifest resource -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="Resources\Inter-Light.ttf">
|
<EmbeddedResource Include="Resources\HellionFont.ttf">
|
||||||
<LogicalName>Inter-Light.ttf</LogicalName>
|
<LogicalName>HellionFont.ttf</LogicalName>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="Resources\Inter-OFL.txt">
|
<EmbeddedResource Include="Resources\HellionFont-OFL.txt">
|
||||||
<LogicalName>Inter-OFL.txt</LogicalName>
|
<LogicalName>HellionFont-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. ASCII
|
<!-- Plugin icon: copy images/* to output for Dalamud discovery -->
|
||||||
study folder is source-only material, no need to ship it. -->
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="images\**" Exclude="images\ascii\**">
|
<None Include="images\**">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
+146
-36
@@ -1,19 +1,64 @@
|
|||||||
name: Hellion Chat
|
name: Hellion Chat
|
||||||
author: Jon Kazama (Hellion Forge)
|
author: JonKazama-Hellion
|
||||||
punchline: Chat replacement for FFXIV that keeps your conversations and forgets the rest.
|
punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2)
|
||||||
description: |-
|
description: |-
|
||||||
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.
|
Hellion Chat is a privacy-focused chat replacement for FINAL FANTASY XIV
|
||||||
|
based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally
|
||||||
|
removed (the optional webinterface) and a stack of privacy controls is
|
||||||
|
added on top. Tabs, channel filters, RGB colours, emotes, screenshot
|
||||||
|
mode, IPC integration and the chat replacement window itself work the
|
||||||
|
same. The webinterface is intentionally not part of Hellion Chat because
|
||||||
|
it serves a different use case from the smaller default footprint this
|
||||||
|
plugin is built around.
|
||||||
|
|
||||||
Retention per channel, retroactive wipe, export to Markdown, JSON or CSV. Setup wizard with four profiles. 25 languages. Its own config and database.
|
On top of that, Hellion Chat adds privacy and data-handling controls
|
||||||
|
designed to align with the modern data protection rules that apply
|
||||||
|
across the EU, the United States and Japan. By default only your own
|
||||||
|
conversations are stored; messages from strangers, NPCs and system
|
||||||
|
spam stay out of the database. Retention windows are configurable per
|
||||||
|
channel, history can be wiped retroactively, and stored data can be
|
||||||
|
exported on demand.
|
||||||
|
|
||||||
Support: https://discord.gg/X9V7Kcv5gR
|
Key privacy and data-handling features:
|
||||||
|
|
||||||
|
- Channel whitelist with a Privacy-First default
|
||||||
|
- Per-channel retention with a daily background sweep
|
||||||
|
- Retroactive cleanup with a Ctrl+Shift confirm
|
||||||
|
- Export to Markdown, JSON or CSV
|
||||||
|
- First-run wizard with three preset profiles (Privacy-First, Casual,
|
||||||
|
Full History)
|
||||||
|
- Bilingual UI (English and German) with live language switching
|
||||||
|
- Independent plugin state — own config file and database directory,
|
||||||
|
so Hellion Chat does not share state with upstream Chat 2
|
||||||
|
|
||||||
|
v1.4.2 — ChatLog Frame-Hot-Path. Three per-frame allocation
|
||||||
|
patterns gone from the chat-log render path: card-mode borders
|
||||||
|
hoist invariants out of the per-message loop, auto-tell tab
|
||||||
|
tint and icon get a per-tab cache, and the status bar gates
|
||||||
|
its tab aggregation behind the same one-second cache it uses
|
||||||
|
for the format strings.
|
||||||
|
|
||||||
|
v1.4.3 — Plugin-Load Async-Init plus Repo-Cutover. Plugin
|
||||||
|
migrated to Dalamud's IAsyncDalamudPlugin so the heavy work
|
||||||
|
(migrations, service allocations, window construction, hook
|
||||||
|
subscription) runs in LoadAsync without blocking Dalamud's
|
||||||
|
UI. Schema-gate replaces the v9 → v16 migration chain;
|
||||||
|
configs on schema v16+ load directly. Custom-repo URL moves
|
||||||
|
to gitea.hellion-forge.cloud, the GitHub repo stays as a
|
||||||
|
frozen v1.4.2 snapshot.
|
||||||
|
|
||||||
|
Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
|
||||||
|
|
||||||
|
Modding & support: join the Hellion Forge Discord at
|
||||||
|
https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
|
||||||
|
other Hellion Online Media plugins/tools.
|
||||||
repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
|
repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
|
||||||
accepts_feedback: true
|
accepts_feedback: true
|
||||||
icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
|
icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
|
||||||
image_urls:
|
image_urls:
|
||||||
- https://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/firstRunWizard.png
|
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/themesPicker.png
|
||||||
tags:
|
tags:
|
||||||
- Social
|
- Social
|
||||||
- UI
|
- UI
|
||||||
@@ -21,39 +66,104 @@ tags:
|
|||||||
- Replacement
|
- Replacement
|
||||||
- Privacy
|
- Privacy
|
||||||
changelog: |-
|
changelog: |-
|
||||||
**v2.0.5 — Focus, and a way out (2026-08-23)**
|
**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover (2026-05-08)**
|
||||||
|
|
||||||
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.
|
Plugin lifecycle migrated to Dalamud's `IAsyncDalamudPlugin`
|
||||||
|
API. The constructor now does only the bootstrap-essentials
|
||||||
|
(config load, language init, conflict detection); migrations,
|
||||||
|
service allocations, window construction and hook subscription
|
||||||
|
move to LoadAsync. Dalamud can keep its UI responsive while the
|
||||||
|
heavy work runs.
|
||||||
|
|
||||||
- **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.
|
- IAsyncDalamudPlugin two-phase load with per-line CaptureFailure
|
||||||
- **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.
|
in DisposeAsync (mirrors LightlessSync's pattern); idempotency
|
||||||
- **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.
|
guard protects against reload races
|
||||||
- **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.
|
- Schema-gate replaces the v9 → v16 migration chain. Configs
|
||||||
- **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.
|
on schema v16+ load directly; older configs trigger an
|
||||||
|
"install v1.4.2 first" error so the historic migration
|
||||||
|
path stays intact
|
||||||
|
- AutoTranslate.PreloadCache moved off the load path. First
|
||||||
|
use may have a sub-second hitch instead of every-load; the
|
||||||
|
upstream chose differently, we accept first-use latency
|
||||||
|
- FontManager.BuildFonts is called sync at the start of
|
||||||
|
LoadAsync; Dalamud rebuilds the font atlas on its own
|
||||||
|
pipeline so the custom Hellion-Exo2 font appears with a
|
||||||
|
brief font-pop after load (matches ChatTwo's behaviour)
|
||||||
|
- Custom-repo URL moved to gitea.hellion-forge.cloud/
|
||||||
|
JonKazama-Hellion/HellionChat. GitHub repo stays as a
|
||||||
|
frozen v1.4.2 snapshot; new releases ship from Gitea.
|
||||||
|
Existing testers need to update the custom-repo URL once
|
||||||
|
- Plugin-load time in this release sits at ~3.7 s median
|
||||||
|
(5 reloads), comparable to v1.4.2. Async migration is
|
||||||
|
foundational for v1.4.4 Lazy-Init optimisations rather
|
||||||
|
than an immediate user-perceived win
|
||||||
|
|
||||||
|
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
|
||||||
|
|
||||||
|
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
||||||
|
|
||||||
|
**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
|
||||||
|
|
||||||
|
Third sub-patch of the v1.4.x Polish Sweep series. Per-frame
|
||||||
|
allocations from the chat-log render path eliminated.
|
||||||
|
|
||||||
|
- DrawMessages card-mode hoists theme/drawList/winLeft/winRight/
|
||||||
|
borderColorAbgr out of the per-message loop. About 500
|
||||||
|
redundant calls per frame at 100 visible messages, multiplied
|
||||||
|
by every pop-out window
|
||||||
|
- Auto-tell tab tint and icon use a per-tab cache. Hash
|
||||||
|
computation and string allocation only happen when the tell
|
||||||
|
target name or world drifts. AutoTellTabTint stays a pure
|
||||||
|
hash helper; cache lives in a thin TabTintCache wrapper
|
||||||
|
- Status bar gates its tab aggregation behind the same
|
||||||
|
one-second cache it already used for the format strings.
|
||||||
|
LINQ Sum and Count replaced with a single foreach pass
|
||||||
|
that runs on roughly 1% of frames
|
||||||
|
|
||||||
|
Realistic frame-time recovery: 2-5% in typical scenes, more
|
||||||
|
on pop-out-heavy setups because the card-border hoist scales
|
||||||
|
per window.
|
||||||
|
|
||||||
|
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
|
||||||
|
|
||||||
|
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
||||||
|
|
||||||
|
**Hellion Chat 1.4.1 — Theme Engine Performance**
|
||||||
|
|
||||||
|
Second sub-patch of the v1.4.x Polish Sweep series. Heap
|
||||||
|
pressure from the theme engine's per-frame render path
|
||||||
|
removed, plus a tenth built-in theme and hardening for
|
||||||
|
the custom-theme hot-reload.
|
||||||
|
|
||||||
|
- Theme records carry a pre-computed ABGR-packed cache
|
||||||
|
for every color slot; cache is filled when the theme
|
||||||
|
is registered and refreshed defensively on every
|
||||||
|
Switch()
|
||||||
|
- HellionStyle.PushGlobal reads ABGR values from the
|
||||||
|
cache instead of calling ColourUtil.RgbaToAbgr per
|
||||||
|
slot per frame; ~13 % render-time recovery measured
|
||||||
|
in typical scenes (plan estimate was 2–6 %, real
|
||||||
|
~10–15 %)
|
||||||
|
- ThemeRegistry custom-theme reload distinguishes a
|
||||||
|
recoverable file lock (editor mid-save) from a
|
||||||
|
permanent IO failure; locked themes keep their
|
||||||
|
last-known-good snapshot and retry on the next
|
||||||
|
lookup instead of dropping out of the picker
|
||||||
|
- New built-in: Synthwave Sunset — Hot Magenta + Cyan
|
||||||
|
on midnight violet, 80s neon-grid vibes; tenth theme
|
||||||
|
in the picker
|
||||||
|
- Author credits refreshed: brand themes are credited
|
||||||
|
as "Hellion Forge"; Mint Grove and Forge Merchantman
|
||||||
|
now credited to Carla Beleandis as a community thanks
|
||||||
|
|
||||||
|
No schema bump, no user-visible behaviour change other
|
||||||
|
than smoother frames on GC-sensitive setups and one
|
||||||
|
additional colour option.
|
||||||
|
|
||||||
|
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
|
||||||
|
|
||||||
|
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**v2.0.4 — Housekeeping (2026-08-20)**
|
|
||||||
|
|
||||||
Nothing changes in how the plugin behaves. Two pieces of tidying that were overdue.
|
|
||||||
|
|
||||||
- **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.
|
|
||||||
- **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.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**v2.0.3 — Pop-out context menu, screenshot mode (2026-08-20)**
|
|
||||||
|
|
||||||
- **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.
|
|
||||||
- **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.
|
|
||||||
- **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.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**v2.0.2 — Emotes out, placeholders fixed (2026-08-19)**
|
|
||||||
|
|
||||||
- **BetterTTV emote support is gone.** Its shared-emote endpoint went behind authentication, and that was where nearly all of them came from — what remained was a 65-entry global set, eleven of which are on the known-broken list, so 54 mostly static images from Twitch's early days. Exactly one was animated, and that one wanted 492 frames and 37 MB of video memory. The plugin now makes no outbound network calls at all. Messages stored with emotes still read fine; they show the code that was typed.
|
|
||||||
- **Five settings descriptions printed `{0}` instead of the plugin name.** All 25 languages were affected, English included — it just hid better there, since "Hide {0} during cutscenes" still scans as a sentence while German puts the placeholder first. A test now walks every resource string with a placeholder and fails if one reaches a widget unformatted.
|
|
||||||
- **New preview images.** The ones in the plugin installer were from 8 May and showed the interface as it looked before any of the window rebuilds.
|
|
||||||
|
|
||||||
Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
|
Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
|
||||||
|
|||||||
@@ -1,208 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
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());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ namespace HellionChat;
|
|||||||
|
|
||||||
// Shared input history for all ChatInputBars (main and pop-out windows).
|
// Shared input history for all ChatInputBars (main and pop-out windows).
|
||||||
// Push deduplicates: existing entries are moved to the end when re-added.
|
// Push deduplicates: existing entries are moved to the end when re-added.
|
||||||
// TEST-MIRROR: ../../Hellion Build test/Util/InputHistoryServiceTests.cs
|
|
||||||
public static class InputHistoryService
|
public static class InputHistoryService
|
||||||
{
|
{
|
||||||
private const int MaxSize = 30;
|
private const int MaxSize = 30;
|
||||||
@@ -42,12 +41,4 @@ public static class InputHistoryService
|
|||||||
return null;
|
return null;
|
||||||
return _entries[cursor];
|
return _entries[cursor];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Plugin reload doesn't reset static state automatically. Plugin.DisposeAsync
|
|
||||||
// calls this so the next load starts with an empty history instead of
|
|
||||||
// inheriting the previous session's entries.
|
|
||||||
public static void Reset()
|
|
||||||
{
|
|
||||||
_entries.Clear();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,150 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
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,7 +2,6 @@ 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;
|
||||||
@@ -24,23 +23,22 @@ 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 ILogger<HonorificService> _logger;
|
private readonly IPluginLog _log;
|
||||||
private readonly IFramework _framework;
|
private readonly IFramework _framework;
|
||||||
private bool _versionWarningLogged;
|
private bool _versionWarningLogged;
|
||||||
|
|
||||||
// Thread: framework only — IPC delivery + ImGui render both run there.
|
|
||||||
public HonorificTitleData? CurrentTitle { get; private set; }
|
public HonorificTitleData? CurrentTitle { get; private set; }
|
||||||
public bool IsAvailable { get; private set; }
|
public bool IsAvailable { get; private set; }
|
||||||
public (uint Major, uint Minor)? DetectedApiVersion { get; private set; }
|
public (uint Major, uint Minor)? DetectedApiVersion { get; private set; }
|
||||||
|
|
||||||
public HonorificService(
|
public HonorificService(
|
||||||
IDalamudPluginInterface pluginInterface,
|
IDalamudPluginInterface pluginInterface,
|
||||||
ILogger<HonorificService> logger,
|
IPluginLog log,
|
||||||
IFramework framework
|
IFramework framework
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
_framework = framework;
|
_framework = framework;
|
||||||
_logger = logger;
|
_log = log;
|
||||||
|
|
||||||
// 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.
|
||||||
@@ -73,7 +71,6 @@ internal sealed class HonorificService : IDisposable
|
|||||||
TryUnsubscribe(() => _disposing.Unsubscribe(OnDisposing));
|
TryUnsubscribe(() => _disposing.Unsubscribe(OnDisposing));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Thread: framework (scheduled from ctor and OnReady).
|
|
||||||
private void TryInitialPull()
|
private void TryInitialPull()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -85,7 +82,7 @@ internal sealed class HonorificService : IDisposable
|
|||||||
{
|
{
|
||||||
if (!_versionWarningLogged)
|
if (!_versionWarningLogged)
|
||||||
{
|
{
|
||||||
_logger.LogWarning(
|
_log.Warning(
|
||||||
"Honorific API version mismatch — expected major 3, "
|
"Honorific API version mismatch — expected major 3, "
|
||||||
+ "found {Major}.{Minor}. Disabling Honorific integration.",
|
+ "found {Major}.{Minor}. Disabling Honorific integration.",
|
||||||
version.Item1,
|
version.Item1,
|
||||||
@@ -105,13 +102,12 @@ 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.
|
||||||
_logger.LogDebug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
|
_log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
|
||||||
IsAvailable = false;
|
IsAvailable = false;
|
||||||
CurrentTitle = null;
|
CurrentTitle = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Thread: framework (Dalamud IPC delivery contract).
|
|
||||||
private void OnTitleChanged(string json)
|
private void OnTitleChanged(string json)
|
||||||
{
|
{
|
||||||
// Skip updates on version mismatch; subscription stays live for reload.
|
// Skip updates on version mismatch; subscription stays live for reload.
|
||||||
@@ -120,13 +116,12 @@ internal sealed class HonorificService : IDisposable
|
|||||||
CurrentTitle = ParseTitleJson(json);
|
CurrentTitle = ParseTitleJson(json);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Thread: any (Honorific dispatches NotifyReady from its own thread).
|
|
||||||
private void OnReady()
|
private void OnReady()
|
||||||
{
|
{
|
||||||
|
// Schedule on framework thread — NotifyReady can dispatch from any thread.
|
||||||
_framework.RunOnFrameworkThread(TryInitialPull);
|
_framework.RunOnFrameworkThread(TryInitialPull);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Thread: framework (IPC delivery contract); idempotent — Disposing fires once.
|
|
||||||
private void OnDisposing()
|
private void OnDisposing()
|
||||||
{
|
{
|
||||||
// Honorific unloading — clear cached state so the header hides next frame.
|
// Honorific unloading — clear cached state so the header hides next frame.
|
||||||
@@ -138,8 +133,6 @@ internal sealed class HonorificService : IDisposable
|
|||||||
DetectedApiVersion = null;
|
DetectedApiVersion = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Thread: framework (called from Dispose, which runs on the framework
|
|
||||||
// cleanup block in Plugin.DisposeAsync).
|
|
||||||
private void TryUnsubscribe(Action unsubscribe)
|
private void TryUnsubscribe(Action unsubscribe)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -148,15 +141,20 @@ internal sealed class HonorificService : IDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
// Warning not Debug — a silent unsubscribe failure leaks a live
|
_log.Debug(ex, "Honorific unsubscribe failed (likely already gone).");
|
||||||
// subscription across plugin reloads.
|
|
||||||
_logger.LogWarning(
|
|
||||||
ex,
|
|
||||||
"Honorific unsubscribe failed (likely API break or gate already gone)."
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Threading: IPC events and ImGui both run on the framework thread, so
|
||||||
|
// OnTitleChanged and the render path never race — no volatile/Interlocked
|
||||||
|
// needed as long as Dalamud's framework-thread delivery contract holds.
|
||||||
|
//
|
||||||
|
// Constructor and OnReady are exceptions: they run outside that contract
|
||||||
|
// (plugin-loader thread and Honorific's NotifyReady respectively), so both
|
||||||
|
// use RunOnFrameworkThread to safely reach ObjectTable.LocalPlayer.
|
||||||
|
|
||||||
|
// --- Pure-logic helpers; tested via HellionChat.Tests/Integrations. ---
|
||||||
|
|
||||||
internal static HonorificTitleData? ParseTitleJson(string json)
|
internal static HonorificTitleData? ParseTitleJson(string json)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(json))
|
if (string.IsNullOrEmpty(json))
|
||||||
@@ -195,23 +193,4 @@ 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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,18 +4,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.
|
||||||
//
|
// Glow/gradient fields omitted; Cycle 1 renders primary Color only.
|
||||||
// Color is rendered in the header title slot (HonorificHeader). Glow, Color3,
|
|
||||||
// GradientColourSet and GradientAnimationStyle are parsed but not rendered —
|
|
||||||
// the animated gradient lives inside Honorific and is not exposed over IPC.
|
|
||||||
// The fields stay in the DTO so the JSON roundtrip remains lossless.
|
|
||||||
internal sealed record HonorificTitleData(
|
internal sealed record HonorificTitleData(
|
||||||
string? Title,
|
string? Title,
|
||||||
bool IsPrefix,
|
bool IsPrefix,
|
||||||
bool IsOriginal,
|
bool IsOriginal,
|
||||||
Vector3? Color,
|
Vector3? Color
|
||||||
Vector3? Glow,
|
|
||||||
Vector3? Color3,
|
|
||||||
int? GradientColourSet,
|
|
||||||
string? GradientAnimationStyle
|
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
using System.Runtime.CompilerServices;
|
|
||||||
using HellionChat.Util;
|
|
||||||
|
|
||||||
namespace HellionChat.Integrations;
|
namespace HellionChat.Integrations;
|
||||||
|
|
||||||
// Third-party plugin URLs — separate from BrandingLinks (Hellion-owned URLs).
|
// Third-party plugin URLs — separate from BrandingLinks (Hellion-owned URLs).
|
||||||
@@ -8,13 +5,4 @@ internal static class IntegrationLinks
|
|||||||
{
|
{
|
||||||
public const string HonorificRepo = "https://github.com/Caraxi/Honorific";
|
public const string HonorificRepo = "https://github.com/Caraxi/Honorific";
|
||||||
public const string HonorificAuthor = "https://github.com/Caraxi";
|
public const string HonorificAuthor = "https://github.com/Caraxi";
|
||||||
|
|
||||||
// See BrandingLinks.ValidateUrls for the CA2255 rationale.
|
|
||||||
#pragma warning disable CA2255
|
|
||||||
[ModuleInitializer]
|
|
||||||
#pragma warning restore CA2255
|
|
||||||
internal static void ValidateUrls()
|
|
||||||
{
|
|
||||||
UrlValidation.ValidateAll(nameof(IntegrationLinks), HonorificRepo, HonorificAuthor);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,9 @@
|
|||||||
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
|
||||||
@@ -29,9 +26,10 @@ public sealed class ExtraChat : IDisposable
|
|||||||
|
|
||||||
internal (string, uint)? ChannelOverride { get; set; }
|
internal (string, uint)? ChannelOverride { get; set; }
|
||||||
|
|
||||||
// volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
|
// Volatile reference: IPC callbacks (OnChannelCommandColours/OnChannelNames) fire on a
|
||||||
// Reference assignment is atomic on x64, but the barrier ensures visibility
|
// Dalamud-dispatcher thread while the ImGui thread reads the IReadOnlyDictionary projections.
|
||||||
// across threads (especially Mono/Wine). Raised in the 2026-05-05 audit.
|
// Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs
|
||||||
|
// the volatile barrier to guarantee visibility across threads. See AUDIT-2026-05-05 [SEC-01].
|
||||||
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;
|
||||||
@@ -39,9 +37,8 @@ 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(ILogger<ExtraChat> logger)
|
internal ExtraChat()
|
||||||
{
|
{
|
||||||
_logger = logger;
|
|
||||||
OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
|
OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
|
||||||
"ExtraChat.OverrideChannelColour"
|
"ExtraChat.OverrideChannelColour"
|
||||||
);
|
);
|
||||||
@@ -57,7 +54,6 @@ public sealed class ExtraChat : IDisposable
|
|||||||
OverrideChannelGate.Subscribe(OnOverrideChannel);
|
OverrideChannelGate.Subscribe(OnOverrideChannel);
|
||||||
ChannelCommandColoursGate.Subscribe(OnChannelCommandColours);
|
ChannelCommandColoursGate.Subscribe(OnChannelCommandColours);
|
||||||
ChannelNamesGate.Subscribe(OnChannelNames);
|
ChannelNamesGate.Subscribe(OnChannelNames);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!);
|
ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!);
|
||||||
@@ -65,8 +61,8 @@ 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; missing IPC peer is normal when the plugin isn't loaded.
|
||||||
_logger.LogTrace(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
|
Plugin.Log.Verbose(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,11 +75,22 @@ public sealed class ExtraChat : IDisposable
|
|||||||
|
|
||||||
private void OnOverrideChannel(OverrideInfo info)
|
private void OnOverrideChannel(OverrideInfo info)
|
||||||
{
|
{
|
||||||
ChannelOverride = info.Channel == null ? null : (info.Channel, info.Rgba);
|
if (info.Channel == null)
|
||||||
|
{
|
||||||
|
ChannelOverride = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ChannelOverride = (info.Channel, info.Rgba);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnChannelCommandColours(Dictionary<string, uint> obj) =>
|
private void OnChannelCommandColours(Dictionary<string, uint> obj)
|
||||||
|
{
|
||||||
ChannelCommandColoursInternal = obj;
|
ChannelCommandColoursInternal = obj;
|
||||||
|
}
|
||||||
|
|
||||||
private void OnChannelNames(Dictionary<Guid, string> obj) => ChannelNamesInternal = obj;
|
private void OnChannelNames(Dictionary<Guid, string> obj)
|
||||||
|
{
|
||||||
|
ChannelNamesInternal = obj;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using Dalamud.Plugin.Ipc;
|
using Dalamud.Plugin.Ipc;
|
||||||
using HellionChat.Code;
|
using HellionChat.Code;
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace HellionChat.Ipc;
|
namespace HellionChat.Ipc;
|
||||||
|
|
||||||
@@ -20,28 +19,12 @@ 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: ChatTwo IPC compatibility mirror. Some third-party plugins
|
|
||||||
// have a no-fork policy and subscribe only to ChatTwo.*-prefixed IPC
|
|
||||||
// gates. HellionChat replaces ChatTwo (conflict detection prevents
|
|
||||||
// parallel loading), so mirroring the ChatTwo provider slots lets those
|
|
||||||
// plugins keep working without code changes on their side. The tuple
|
|
||||||
// shape is textually identical to ChatTwo's IPC surface (same member
|
|
||||||
// order, same underlying types — ChatType is `ushort` in both repos)
|
|
||||||
// so Dalamud's IPC marshalling matches across plugin boundaries.
|
|
||||||
private ICallGateProvider<ChatInputState> ChatTwoStateQueryGate { get; }
|
|
||||||
private ICallGateProvider<ChatInputState, object?> ChatTwoStateChangedGate { get; }
|
|
||||||
|
|
||||||
private ChatInputState LastState;
|
private ChatInputState LastState;
|
||||||
private bool HasState;
|
private bool HasState;
|
||||||
|
|
||||||
private readonly Ui.Components.InputBar _inputBar;
|
internal TypingIpc(Plugin plugin)
|
||||||
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"
|
||||||
@@ -50,48 +33,30 @@ internal sealed class TypingIpc : IDisposable
|
|||||||
"HellionChat.ChatInputStateChanged"
|
"HellionChat.ChatInputStateChanged"
|
||||||
);
|
);
|
||||||
|
|
||||||
// v1.4.9: ChatTwo-prefixed compatibility slots (see class-level comment).
|
|
||||||
ChatTwoStateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
|
|
||||||
"ChatTwo.GetChatInputState"
|
|
||||||
);
|
|
||||||
ChatTwoStateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>(
|
|
||||||
"ChatTwo.ChatInputStateChanged"
|
|
||||||
);
|
|
||||||
|
|
||||||
StateQueryGate.RegisterFunc(GetState);
|
StateQueryGate.RegisterFunc(GetState);
|
||||||
ChatTwoStateQueryGate.RegisterFunc(GetState);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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: mainWindowOpen,
|
InputVisible: !log.IsHidden,
|
||||||
InputFocused: inputFocused,
|
log.InputFocused,
|
||||||
HasText: hasText,
|
HasText: log.Chat.Length > 0,
|
||||||
IsTyping: hasText,
|
IsTyping: log is { InputFocused: true, Chat.Length: > 0 },
|
||||||
TextLength: textLength,
|
TextLength: log.Chat.Length,
|
||||||
ChannelType: channelType
|
ChannelType: channelType
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal ChatInputState GetState() => BuildState();
|
private ChatInputState GetState() => BuildState();
|
||||||
|
|
||||||
internal void Update()
|
internal void Update()
|
||||||
{
|
{
|
||||||
@@ -102,13 +67,10 @@ internal sealed class TypingIpc : IDisposable
|
|||||||
HasState = true;
|
HasState = true;
|
||||||
LastState = state;
|
LastState = state;
|
||||||
StateChangedGate.SendMessage(state);
|
StateChangedGate.SendMessage(state);
|
||||||
// v1.4.9: mirror on ChatTwo-prefixed slot for no-fork-policy plugins.
|
|
||||||
ChatTwoStateChangedGate.SendMessage(state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
StateQueryGate.UnregisterFunc();
|
StateQueryGate.UnregisterFunc();
|
||||||
ChatTwoStateQueryGate.UnregisterFunc();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,11 @@
|
|||||||
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; }
|
||||||
@@ -22,31 +19,10 @@ internal sealed class IpcManager : IDisposable
|
|||||||
object?
|
object?
|
||||||
> InvokeGate { get; }
|
> InvokeGate { get; }
|
||||||
|
|
||||||
// v1.4.9: ChatTwo IPC compatibility mirror. Third-party plugins with
|
|
||||||
// a no-fork policy (e.g. Artisan, AllaganTools) only subscribe to the
|
|
||||||
// ChatTwo.*-prefixed context-menu integration gates. Mirroring all four
|
|
||||||
// provider slots under the ChatTwo namespace lets those plugins keep
|
|
||||||
// working without code changes on their side. Conflict detection
|
|
||||||
// prevents ChatTwo and HellionChat from loading in parallel, so no slot
|
|
||||||
// collision risk.
|
|
||||||
private ICallGateProvider<string> ChatTwoRegisterGate { get; }
|
|
||||||
private ICallGateProvider<string, object?> ChatTwoUnregisterGate { get; }
|
|
||||||
private ICallGateProvider<object?> ChatTwoAvailableGate { get; }
|
|
||||||
private ICallGateProvider<
|
|
||||||
string,
|
|
||||||
PlayerPayload?,
|
|
||||||
ulong,
|
|
||||||
Payload?,
|
|
||||||
SeString?,
|
|
||||||
SeString?,
|
|
||||||
object?
|
|
||||||
> ChatTwoInvokeGate { get; }
|
|
||||||
|
|
||||||
internal List<string> Registered { get; } = [];
|
internal List<string> Registered { get; } = [];
|
||||||
|
|
||||||
public IpcManager(ILogger<IpcManager> logger)
|
public IpcManager()
|
||||||
{
|
{
|
||||||
_logger = logger;
|
|
||||||
RegisterGate = Plugin.Interface.GetIpcProvider<string>("HellionChat.Register");
|
RegisterGate = Plugin.Interface.GetIpcProvider<string>("HellionChat.Register");
|
||||||
RegisterGate.RegisterFunc(Register);
|
RegisterGate.RegisterFunc(Register);
|
||||||
|
|
||||||
@@ -65,32 +41,7 @@ internal sealed class IpcManager : IDisposable
|
|||||||
object?
|
object?
|
||||||
>("HellionChat.Invoke");
|
>("HellionChat.Invoke");
|
||||||
|
|
||||||
// v1.4.9: ChatTwo-prefixed mirrors of the four context-menu slots
|
|
||||||
// above. Share the same Register/Unregister backing methods so a
|
|
||||||
// plugin that subscribes via either namespace lands in the same
|
|
||||||
// Registered list. SendMessage on Invoke fans out to both gates.
|
|
||||||
ChatTwoRegisterGate = Plugin.Interface.GetIpcProvider<string>("ChatTwo.Register");
|
|
||||||
ChatTwoRegisterGate.RegisterFunc(Register);
|
|
||||||
|
|
||||||
ChatTwoAvailableGate = Plugin.Interface.GetIpcProvider<object?>("ChatTwo.Available");
|
|
||||||
|
|
||||||
ChatTwoUnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>(
|
|
||||||
"ChatTwo.Unregister"
|
|
||||||
);
|
|
||||||
ChatTwoUnregisterGate.RegisterAction(Unregister);
|
|
||||||
|
|
||||||
ChatTwoInvokeGate = Plugin.Interface.GetIpcProvider<
|
|
||||||
string,
|
|
||||||
PlayerPayload?,
|
|
||||||
ulong,
|
|
||||||
Payload?,
|
|
||||||
SeString?,
|
|
||||||
SeString?,
|
|
||||||
object?
|
|
||||||
>("ChatTwo.Invoke");
|
|
||||||
|
|
||||||
AvailableGate.SendMessage();
|
AvailableGate.SendMessage();
|
||||||
ChatTwoAvailableGate.SendMessage();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void Invoke(
|
internal void Invoke(
|
||||||
@@ -103,8 +54,6 @@ internal sealed class IpcManager : IDisposable
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
|
InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
|
||||||
// v1.4.9: fan out the same event to plugins listening on ChatTwo.Invoke.
|
|
||||||
ChatTwoInvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private string Register()
|
private string Register()
|
||||||
@@ -123,8 +72,6 @@ internal sealed class IpcManager : IDisposable
|
|||||||
{
|
{
|
||||||
UnregisterGate.UnregisterAction();
|
UnregisterGate.UnregisterAction();
|
||||||
RegisterGate.UnregisterFunc();
|
RegisterGate.UnregisterFunc();
|
||||||
ChatTwoUnregisterGate.UnregisterAction();
|
|
||||||
ChatTwoRegisterGate.UnregisterFunc();
|
|
||||||
Registered.Clear();
|
Registered.Clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+25
-4
@@ -153,8 +153,8 @@ public partial class Message
|
|||||||
}
|
}
|
||||||
catch (ArgumentException ex)
|
catch (ArgumentException ex)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Error(ex, "Failed to parse extra chat channel GUID");
|
Plugin.Log.Error(ex, "Failed to parse extra chat channel GUID");
|
||||||
Plugin.LogProxy.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
|
Plugin.Log.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
|
||||||
return Guid.Empty;
|
return Guid.Empty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -175,6 +175,8 @@ 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
|
||||||
@@ -205,6 +207,25 @@ 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
|
||||||
@@ -230,7 +251,7 @@ public partial class Message
|
|||||||
AddChunkWithMessage(
|
AddChunkWithMessage(
|
||||||
text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
|
text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
|
||||||
);
|
);
|
||||||
Plugin.LogProxy.Debug(
|
Plugin.Log.Debug(
|
||||||
$"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"
|
$"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -395,7 +416,7 @@ public partial class Message
|
|||||||
catch (Exception)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
|
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
|
||||||
Plugin.LogProxy.Debug($"Failed to parse the text param: '{split}'");
|
Plugin.Log.Debug($"Failed to parse the text param: '{split}'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+27
-188
@@ -7,16 +7,13 @@ 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;
|
||||||
|
|
||||||
@@ -25,7 +22,6 @@ 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; } = [];
|
||||||
@@ -52,21 +48,11 @@ 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(
|
internal unsafe MessageManager(Plugin plugin)
|
||||||
Plugin plugin,
|
|
||||||
ILogger<MessageManager> logger,
|
|
||||||
ILoggerFactory loggerFactory
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
Plugin = plugin;
|
Plugin = plugin;
|
||||||
_logger = logger;
|
|
||||||
|
|
||||||
Store = new MessageStore(
|
Store = new MessageStore(DatabasePath());
|
||||||
DatabasePath(),
|
|
||||||
Plugin.PlatformUtil,
|
|
||||||
loggerFactory.CreateLogger<MessageStore>(),
|
|
||||||
loggerFactory
|
|
||||||
);
|
|
||||||
|
|
||||||
PendingMessageThread = new Thread(() =>
|
PendingMessageThread = new Thread(() =>
|
||||||
ProcessPendingMessages(PendingThreadCancellationToken.Token)
|
ProcessPendingMessages(PendingThreadCancellationToken.Token)
|
||||||
@@ -105,7 +91,7 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
await Task.Delay(100);
|
await Task.Delay(100);
|
||||||
|
|
||||||
if (PendingMessageThread.IsAlive)
|
if (PendingMessageThread.IsAlive)
|
||||||
_logger.LogWarning(
|
Plugin.Log.Warning(
|
||||||
"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."
|
||||||
);
|
);
|
||||||
@@ -151,7 +137,7 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Error processing pending message");
|
Plugin.Log.Error(ex, "Error processing pending message");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -163,15 +149,8 @@ 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 tabsSnapshot.Where(t => !t.IsTempTab))
|
foreach (var tab in Plugin.Config.Tabs.Where(t => !t.IsTempTab))
|
||||||
tab.Clear();
|
tab.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,19 +162,18 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
|
|
||||||
using var messages = Store.GetMostRecentMessages(CurrentContentId, since);
|
using var messages = Store.GetMostRecentMessages(CurrentContentId, since);
|
||||||
|
|
||||||
// TempTabs excluded (live state from AutoTellTabsService). Bucket via the
|
// TempTabs are excluded; they maintain live state from AutoTellTabsService
|
||||||
// pure MapMessagesToTabs so the assignment stays testable outside Dalamud.
|
var pendingTabs = Plugin
|
||||||
// Snapshot under the shared lock (list copy only — short critical
|
.Config.Tabs.Where(t => !t.IsTempTab)
|
||||||
// section). The Store query above and the AddSortPrune writes below stay
|
.Select(tab => (tab, new List<Message>()))
|
||||||
// OUTSIDE the lock (lock order: list outer, MessageList inner).
|
.ToList();
|
||||||
List<Tab> nonTempTabs;
|
foreach (var message in messages)
|
||||||
lock (Plugin.TabsListLock)
|
foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
|
||||||
nonTempTabs = Plugin.Config.Tabs.Where(t => !t.IsTempTab).ToList();
|
pendingMessages.Add(message);
|
||||||
var buckets = MapMessagesToTabs(nonTempTabs, messages);
|
|
||||||
|
|
||||||
// Apply messages to chat log all at once.
|
// Apply messages to chat log all at once.
|
||||||
foreach (var tab in nonTempTabs)
|
foreach (var (tab, pendingMessages) in pendingTabs)
|
||||||
tab.Messages.AddSortPrune(buckets[tab], MessageDisplayLimit);
|
tab.Messages.AddSortPrune(pendingMessages, MessageDisplayLimit);
|
||||||
|
|
||||||
if (!messages.DidError)
|
if (!messages.DidError)
|
||||||
return;
|
return;
|
||||||
@@ -204,36 +182,14 @@ 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();
|
||||||
_logger.LogInformation(
|
Plugin.Log.Info($"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())
|
||||||
{
|
{
|
||||||
_logger.LogDebug($"Marking message '{msgId}' as deleted due to parse failure");
|
Plugin.Log.Debug($"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(() =>
|
||||||
@@ -245,12 +201,10 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Error in FilterAllTabs");
|
Plugin.Log.Error(ex, "Error in FilterAllTabs");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Information, not Debug, so the xllog tail surfaces this without a
|
Plugin.Log.Debug($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
|
||||||
// filter. Kept as a guard against future plugin-load regressions.
|
|
||||||
_logger.LogInformation($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -305,7 +259,7 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Error in ContentIdResolver");
|
Plugin.Log.Error(ex, "Error in ContentIdResolver");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -358,135 +312,20 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle())
|
if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle())
|
||||||
Store.UpsertMessage(message);
|
Store.UpsertMessage(message);
|
||||||
|
|
||||||
// Snapshot the list, not just the active tab. This loop runs on the worker
|
var currentMatches = Plugin.CurrentTab.Matches(message);
|
||||||
// thread while SaveConfig's strip and the auto-tell spawn mutate Config.Tabs
|
foreach (var tab in Plugin.Config.Tabs)
|
||||||
// under TabsListLock — enumerating it live throws "collection was modified",
|
|
||||||
// and the catch in ProcessPendingMessages swallows that, silently dropping
|
|
||||||
// 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)
|
|
||||||
{
|
{
|
||||||
|
var unread = !(
|
||||||
|
tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches
|
||||||
|
);
|
||||||
|
|
||||||
if (tab.Matches(message))
|
if (tab.Matches(message))
|
||||||
tab.AddMessage(message, ShouldCountUnread(tab, currentTab, currentTabMatches));
|
tab.AddMessage(message, unread);
|
||||||
}
|
|
||||||
|
|
||||||
// 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;
|
||||||
|
|||||||
+416
-838
File diff suppressed because it is too large
Load Diff
@@ -1,42 +0,0 @@
|
|||||||
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(),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Regular → Executable
+484
-539
File diff suppressed because it is too large
Load Diff
+197
-1027
File diff suppressed because it is too large
Load Diff
@@ -1,480 +0,0 @@
|
|||||||
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
|
|
||||||
);
|
|
||||||
@@ -1,152 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,154 +0,0 @@
|
|||||||
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,15 +4,10 @@ namespace HellionChat.Privacy;
|
|||||||
|
|
||||||
internal static class PrivacyDefaults
|
internal static class PrivacyDefaults
|
||||||
{
|
{
|
||||||
// Failsafe for ChatTypes added by future FFXIV patches. New installs
|
// Privacy-First default whitelist (DSGVO Art. 25 - Privacy by Default).
|
||||||
// persist unknown channels so a major patch's added ChatType isn't silently
|
// Only the player's own conversations are persisted out-of-the-box.
|
||||||
// dropped before the user can opt in or out. Existing configs keep their
|
// Public chat (Say/Shout/Yell), Novice Network, NPC dialogue, system
|
||||||
// explicit choice — see Configuration.cs PrivacyPersistUnknownChannels.
|
// logs and battle messages are NOT persisted unless the user opts in.
|
||||||
internal const bool DefaultPersistUnknownChannels = true;
|
|
||||||
|
|
||||||
// DSGVO Art. 25 (Privacy by Default): only the player's own conversations
|
|
||||||
// are persisted out-of-the-box. Public chat, NPC dialogue, system logs and
|
|
||||||
// battle messages require explicit opt-in.
|
|
||||||
internal static readonly IReadOnlySet<ChatType> PrivacyFirstWhitelist = new HashSet<ChatType>
|
internal static readonly IReadOnlySet<ChatType> PrivacyFirstWhitelist = new HashSet<ChatType>
|
||||||
{
|
{
|
||||||
ChatType.TellIncoming,
|
ChatType.TellIncoming,
|
||||||
@@ -47,8 +42,10 @@ internal static class PrivacyDefaults
|
|||||||
ChatType.ExtraChatLinkshell8,
|
ChatType.ExtraChatLinkshell8,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Per-channel retention in days. Unlisted channels fall back to
|
// Default retention windows per channel (in days). Channels not listed
|
||||||
// Configuration.RetentionDefaultDays. Tells: 365, everything else: 90.
|
// here fall back to Configuration.RetentionDefaultDays. Reflects the
|
||||||
|
// design spec: Tells 365, own-conversation channels 90, everything else
|
||||||
|
// shorter via the global default.
|
||||||
internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays =
|
internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays =
|
||||||
new Dictionary<ChatType, int>
|
new Dictionary<ChatType, int>
|
||||||
{
|
{
|
||||||
@@ -89,9 +86,10 @@ internal static class PrivacyDefaults
|
|||||||
[ChatType.ExtraChatLinkshell8] = 90,
|
[ChatType.ExtraChatLinkshell8] = 90,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Casual: Privacy-First + public chat (Say/Shout/Yell, emotes, Novice
|
// Casual profile = Privacy-First plus public chat (Say/Shout/Yell, both
|
||||||
// Network) with a 1-day window so recent RP/trade is searchable but
|
// emote types, Novice Network), kept for a short 24-hour window so the
|
||||||
// third-party data doesn't accumulate.
|
// last RP scene or shout trade is still searchable but third-party data
|
||||||
|
// doesn't accumulate forever.
|
||||||
internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
|
internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
|
||||||
PrivacyFirstWhitelist
|
PrivacyFirstWhitelist
|
||||||
)
|
)
|
||||||
@@ -114,29 +112,4 @@ 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,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
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.
|
Before Width: | Height: | Size: 419 KiB |
@@ -1,4 +0,0 @@
|
|||||||
|\_/|,,_____,~~`
|
|
||||||
(.".)~~ )`~}}
|
|
||||||
\o/\ /---~\\ ~}}
|
|
||||||
_// _// ~}
|
|
||||||
Regular → Executable
+93
-93
@@ -1,93 +1,93 @@
|
|||||||
Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
|
Copyright 2013 The Exo 2 Project Authors (https://github.com/googlefonts/Exo-2.0)
|
||||||
|
|
||||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
This license is copied below, and is also available with a FAQ at:
|
This license is copied below, and is also available with a FAQ at:
|
||||||
https://openfontlicense.org
|
https://openfontlicense.org
|
||||||
|
|
||||||
|
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
-----------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
|
|
||||||
PREAMBLE
|
PREAMBLE
|
||||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
development of collaborative font projects, to support the font creation
|
development of collaborative font projects, to support the font creation
|
||||||
efforts of academic and linguistic communities, and to provide a free and
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
open framework in which fonts may be shared and improved in partnership
|
open framework in which fonts may be shared and improved in partnership
|
||||||
with others.
|
with others.
|
||||||
|
|
||||||
The OFL allows the licensed fonts to be used, studied, modified and
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
redistributed freely as long as they are not sold by themselves. The
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
fonts, including any derivative works, can be bundled, embedded,
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
redistributed and/or sold with any software provided that any reserved
|
redistributed and/or sold with any software provided that any reserved
|
||||||
names are not used by derivative works. The fonts and derivatives,
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
however, cannot be released under any other type of license. The
|
however, cannot be released under any other type of license. The
|
||||||
requirement for fonts to remain under this license does not apply
|
requirement for fonts to remain under this license does not apply
|
||||||
to any document created using the fonts or their derivatives.
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
DEFINITIONS
|
DEFINITIONS
|
||||||
"Font Software" refers to the set of files released by the Copyright
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
Holder(s) under this license and clearly marked as such. This may
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
include source files, build scripts and documentation.
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
"Reserved Font Name" refers to any names specified as such after the
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
copyright statement(s).
|
copyright statement(s).
|
||||||
|
|
||||||
"Original Version" refers to the collection of Font Software components as
|
"Original Version" refers to the collection of Font Software components as
|
||||||
distributed by the Copyright Holder(s).
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
or substituting -- in part or in whole -- any of the components of the
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
Original Version, by changing formats or by porting the Font Software to a
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
new environment.
|
new environment.
|
||||||
|
|
||||||
"Author" refers to any designer, engineer, programmer, technical
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
writer or other person who contributed to the Font Software.
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
PERMISSION & CONDITIONS
|
PERMISSION & CONDITIONS
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
redistribute, and sell modified and unmodified copies of the Font
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
Software, subject to the following conditions:
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
1) Neither the Font Software nor any of its individual components,
|
1) Neither the Font Software nor any of its individual components,
|
||||||
in Original or Modified Versions, may be sold by itself.
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
2) Original or Modified Versions of the Font Software may be bundled,
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
redistributed and/or sold with any software, provided that each copy
|
redistributed and/or sold with any software, provided that each copy
|
||||||
contains the above copyright notice and this license. These can be
|
contains the above copyright notice and this license. These can be
|
||||||
included either as stand-alone text files, human-readable headers or
|
included either as stand-alone text files, human-readable headers or
|
||||||
in the appropriate machine-readable metadata fields within text or
|
in the appropriate machine-readable metadata fields within text or
|
||||||
binary files as long as those fields can be easily viewed by the user.
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
3) No Modified Version of the Font Software may use the Reserved Font
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
Name(s) unless explicit written permission is granted by the corresponding
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
Copyright Holder. This restriction only applies to the primary font name as
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
presented to the users.
|
presented to the users.
|
||||||
|
|
||||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
Software shall not be used to promote, endorse or advertise any
|
Software shall not be used to promote, endorse or advertise any
|
||||||
Modified Version, except to acknowledge the contribution(s) of the
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
permission.
|
permission.
|
||||||
|
|
||||||
5) The Font Software, modified or unmodified, in part or in whole,
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
must be distributed entirely under this license, and must not be
|
must be distributed entirely under this license, and must not be
|
||||||
distributed under any other license. The requirement for fonts to
|
distributed under any other license. The requirement for fonts to
|
||||||
remain under this license does not apply to any document created
|
remain under this license does not apply to any document created
|
||||||
using the Font Software.
|
using the Font Software.
|
||||||
|
|
||||||
TERMINATION
|
TERMINATION
|
||||||
This license becomes null and void if any of the above conditions are
|
This license becomes null and void if any of the above conditions are
|
||||||
not met.
|
not met.
|
||||||
|
|
||||||
DISCLAIMER
|
DISCLAIMER
|
||||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user