Allow disable display self-analysis alert

.gitignore

@@ -2,15 +2,17 @@
 ## files generated by popular Visual Studio add-ons.
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
+.idea
 # User-specific files
 *.rsuser
 *.suo
 *.user
 *.userosscache
 *.sln.docstates
-*.bak
 .DS_Store
+MareSynchronos/.DS_Store
+*.zip
+UmbraServer_extracted/
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

.gitmodules

@@ -1,15 +1,12 @@
-[submodule "UmbraAPI"]
-    path = UmbraAPI
-    url  = https://git.umbra-sync.net/SirConstance/UmbraAPI.git
-
+[submodule "MareAPI"]
+	path = MareAPI
+	url = ssh://git@git.umbra-sync.net:1222/Keda/UmbraAPI.git
+	branch = main
 [submodule "Penumbra.Api"]
-    path = Penumbra.Api
-    url  = https://github.com/Ottermandias/Penumbra.Api.git
-
+	path = Penumbra.Api
+	url = https://github.com/Ottermandias/Penumbra.Api.git
+	branch = main
 [submodule "Glamourer.Api"]
-    path = Glamourer.Api
-    url  = https://github.com/Ottermandias/Glamourer.Api
-
-[submodule "UmbraCrypt"]
-	path = UmbraCrypt
-	url = https://git.umbra-sync.net/SirConstance/UmbraCrypt.git
+	path = Glamourer.Api
+	url = https://github.com/Ottermandias/Glamourer.Api.git
+	branch = main

Glamourer.Api/.gitignore

@@ -1,3 +0,0 @@
-bin/
-obj/
-.vs/

Glamourer.Api/Api/IGlamourerApi.cs

@@ -1,14 +0,0 @@
-namespace Glamourer.Api.Api;
-
-/// <summary> The full API available. </summary>
-public interface IGlamourerApi : IGlamourerApiBase
-{
-    /// <inheritdoc cref="IGlamourerApiDesigns"/>
-    public IGlamourerApiDesigns Designs { get; }
-
-    /// <inheritdoc cref="IGlamourerApiItems"/>
-    public IGlamourerApiItems   Items   { get; }
-
-    /// <inheritdoc cref="IGlamourerApiState"/>
-    public IGlamourerApiState   State   { get; }
-}

Glamourer.Api/Api/IGlamourerApiBase.cs

@@ -1,11 +0,0 @@
-namespace Glamourer.Api.Api;
-
-/// <summary> Basic API functions. </summary>
-public interface IGlamourerApiBase
-{
-    /// <summary>
-    /// Get the current API version of the Glamourer available in this installation.
-    /// Major version changes indicate incompatibilities, minor version changes are backward-compatible additions.
-    /// </summary>
-    public (int Major, int Minor) ApiVersion { get; }
-}

Glamourer.Api/Api/IGlamourerApiDesigns.cs

@@ -1,33 +0,0 @@
-using Glamourer.Api.Enums;
-
-namespace Glamourer.Api.Api;
-
-/// <summary> All functions related to Glamourer designs. </summary>
-public interface IGlamourerApiDesigns
-{
-    /// <summary> Obtain a list of all available designs. </summary>
-    /// <returns> A dictionary of all designs from their GUID to their current display name. </returns>
-    public Dictionary<Guid, string> GetDesignList();
-
-    /// <summary> Apply an existing design to an actor.  </summary>
-    /// <param name="designId"> The GUID of the design to apply. </param>
-    /// <param name="objectIndex"> The game object index of the actor to be manipulated. </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once, Equipment, Customization, Lock (see <see cref="ApplyFlag"/>.)</param>
-    /// <returns> DesignNotFound, ActorNotFound, InvalidKey, Success. </returns>
-    public GlamourerApiEc ApplyDesign(Guid designId, int objectIndex, uint key, ApplyFlag flags);
-
-    /// <summary> Apply an existing design to an actor.  </summary>
-    /// <param name="designId"> The GUID of the design to apply. </param>
-    /// <param name="playerName"> The name of the players to be manipulated. </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once, Equipment, Customization, Lock (see <see cref="ApplyFlag"/>.)</param>
-    /// <returns> DesignNotFound, ActorNotFound, InvalidKey, Success. </returns>
-    /// /// <remarks>
-    /// The player does not have to be currently available as long as he has a persisted Glamourer state.<br/>
-    /// Only players are checked for name equality, no NPCs.<br/>
-    /// If multiple players of the same name are found, all of them are reverted.<br/>
-    /// Prefer to use the index-based function unless you need to get the state of someone currently unavailable.
-    /// </remarks>
-    public GlamourerApiEc ApplyDesignName(Guid designId, string playerName, uint key, ApplyFlag flags);
-}

Glamourer.Api/Api/IGlamourerApiItems.cs

@@ -1,80 +0,0 @@
-using Glamourer.Api.Enums;
-
-namespace Glamourer.Api.Api;
-
-/// <summary> All functions related to items. </summary>
-public interface IGlamourerApiItems
-{
-    /// <summary> Set a single item on an actor. </summary>
-    /// <param name="objectIndex"> The game object index of the actor to be manipulated. </param>
-    /// <param name="slot"> The slot to apply the item to. </param>
-    /// <param name="itemId"> The (Custom) ID of the item to apply. </param>
-    /// <param name="stains"> The IDs of the stains to apply to the item. </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once (see <see cref="ApplyFlag"/>.)</param>
-    /// <returns> ItemInvalid, ActorNotFound, ActorNotHuman, InvalidKey, Success. </returns>
-    /// <remarks> The item ID can be a custom item ID in Glamourer's format for models without an associated item, or a normal game item ID. </remarks>
-    public GlamourerApiEc SetItem(int objectIndex, ApiEquipSlot slot, ulong itemId, IReadOnlyList<byte> stains, uint key, ApplyFlag flags);
-
-    /// <summary> Set a single item on players. </summary>
-    /// <param name="playerName"> The name of the players to be manipulated. </param>
-    /// <param name="slot"> The slot to apply the item to. </param>
-    /// <param name="itemId"> The (Custom) ID of the item to apply. </param>
-    /// <param name="stains"> The IDs of the stains to apply to the item. </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once (see <see cref="ApplyFlag"/>.)</param>
-    /// <returns> ItemInvalid, ActorNotFound, ActorNotHuman, InvalidKey, Success. </returns>
-    /// <remarks>
-    /// The item ID can be a custom item ID in Glamourer's format for models without an associated item, or a normal game item ID.<br/>
-    /// The player does not have to be currently available as long as he has a persisted Glamourer state.<br/>
-    /// Only players are checked for name equality, no NPCs.<br/>
-    /// If multiple players of the same name are found, all of them are modified.<br/>
-    /// Prefer to use the index-based function unless you need to get the state of someone currently unavailable.
-    /// </remarks>
-    public GlamourerApiEc SetItemName(string playerName, ApiEquipSlot slot, ulong itemId, IReadOnlyList<byte> stains, uint key,
-        ApplyFlag flags);
-
-    /// <summary> Set a single bonus item on an actor. </summary>
-    /// <param name="objectIndex"> The game object index of the actor to be manipulated. </param>
-    /// <param name="slot"> The bonus slot to apply the item to. </param>
-    /// <param name="bonusItemId"> The bonus item sheet ID of the item to apply (including stain). </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once (see <see cref="ApplyFlag"/>.)</param>
-    /// <returns> ItemInvalid, ActorNotFound, ActorNotHuman, InvalidKey, Success. </returns>
-    /// <remarks> The bonus item ID can currently not be a custom item ID in Glamourer's format for models without an associated item. Use 0 to remove the bonus item. </remarks>
-    public GlamourerApiEc SetBonusItem(int objectIndex, ApiBonusSlot slot, ulong bonusItemId, uint key, ApplyFlag flags);
-
-    /// <summary> Set a single bonus item on an actor. </summary>
-    /// <param name="playerName"> The game object index of the actor to be manipulated. </param>
-    /// <param name="slot"> The bonus slot to apply the item to. </param>
-    /// <param name="bonusItemId"> The bonus item sheet ID of the item to apply (including stain). </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once (see <see cref="ApplyFlag"/>.)</param>
-    /// <returns> ItemInvalid, ActorNotFound, ActorNotHuman, InvalidKey, Success. </returns>
-    /// <remarks>
-    /// The bonus item ID can currently not be a custom item ID in Glamourer's format for models without an associated item. Use 0 to remove the bonus item. <br/>
-    /// The player does not have to be currently available as long as he has a persisted Glamourer state.<br/>
-    /// Only players are checked for name equality, no NPCs.<br/>
-    /// If multiple players of the same name are found, all of them are modified.<br/>
-    /// Prefer to use the index-based function unless you need to get the state of someone currently unavailable.
-    /// </remarks>
-    public GlamourerApiEc SetBonusItemName(string playerName, ApiBonusSlot slot, ulong bonusItemId, uint key, ApplyFlag flags);
-
-    /// <summary> Set the defined Meta State flags to the active or inactive state on actor. </summary>
-    /// <param name="objectIndex"> The game object index of the actor to be manipulated. </param>
-    /// <param name="types"> The flags defining which meta states to update to the new value. This can be multiple at once. </param>
-    /// <param name="newValue"> The new value to update to. </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once (see <see cref="ApplyFlag.Once"/>.)</param>
-    /// <returns> ItemInvalid, ActorNotFound, ActorNotHuman, InvalidKey, Success. </returns>
-    public GlamourerApiEc SetMetaState(int objectIndex, MetaFlag types, bool newValue, uint key, ApplyFlag flags);
-
-    /// <summary> Set the defined Meta State flags to the active or inactive state on actor (by name) </summary>
-    /// <param name="playerName"> The name of the players to be manipulated. </param>
-    /// <param name="types"> The flags defining which meta states to update to the new value. This can be multiple at once. </param>
-    /// <param name="newValue"> The new value to update to. </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once (see <see cref="ApplyFlag.Once"/>.)</param>
-    /// <returns> ItemInvalid, ActorNotFound, ActorNotHuman, InvalidKey, Success. </returns>
-    public GlamourerApiEc SetMetaStateName(string playerName, MetaFlag types, bool newValue, uint key, ApplyFlag flags);
-}

Glamourer.Api/Api/IGlamourerApiState.cs

@@ -1,124 +0,0 @@
-using Glamourer.Api.Enums;
-using Newtonsoft.Json.Linq;
-
-namespace Glamourer.Api.Api;
-
-/// <summary> Any functions related to Glamourer's state tracking. </summary>
-public interface IGlamourerApiState
-{
-    /// <summary> Get the current Glamourer state of an actor. </summary>
-    /// <param name="objectIndex"> The game object index of the desired actor. </param>
-    /// <param name="key"> A key to unlock the state if necessary. </param>
-    /// <returns> ActorNotFound, InvalidKey or Success, and the state on success. </returns>
-    /// <remarks> The actor does not need to have a prior Glamourer state as long as it can be found. </remarks>
-    public (GlamourerApiEc, JObject?) GetState(int objectIndex, uint key);
-
-    /// <summary> Get the current Glamourer state of a player character. </summary>
-    /// <param name="playerName"> The name of the desired player. </param>
-    /// <param name="key"> A key to unlock the state if necessary. </param>
-    /// <returns> ActorNotFound, InvalidKey or Success, and the state on success. </returns>
-    /// <remarks>
-    /// The player does not have to be currently available as long as he has a persisted Glamourer state.
-    /// Only players are checked for name equality, no NPCs.
-    /// If multiple players of the same name are found, the first is returned.
-    /// Prefer to use the index-based function unless you need to get the state of someone currently unavailable.
-    /// </remarks>
-    public (GlamourerApiEc, JObject?) GetStateName(string playerName, uint key);
-
-    /// <inheritdoc cref="GetState"/>
-    public (GlamourerApiEc, string?) GetStateBase64(int objectIndex, uint key);
-
-    /// <inheritdoc cref="GetStateName"/>
-    public (GlamourerApiEc, string?) GetStateBase64Name(string objectName, uint key);
-
-    /// <summary> Apply a supplied state to an actor. </summary>
-    /// <param name="applyState"> The state, which can be either a Glamourer-supplied JObject or a Base64 string. </param>
-    /// <param name="objectIndex"> The game object index of the actor to be manipulated. </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the application. Respects Once, Equipment, Customization and Lock (see <see cref="ApplyFlag"/>.) </param>
-    /// <returns> ActorNotFound, InvalidKey, ActorNotHuman, Success. </returns>
-    public GlamourerApiEc ApplyState(object applyState, int objectIndex, uint key, ApplyFlag flags);
-
-    /// <summary> Apply a supplied state to players. </summary>
-    /// <param name="applyState"> The state, which can be either a Glamourer-supplied JObject or a Base64 string. </param>
-    /// <param name="playerName"> The name of the player to be manipulated. </param>
-    /// <param name="key"> A key to unlock or lock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the application. Respects Once, Equipment, Customization and Lock (see <see cref="ApplyFlag"/>.) </param>
-    /// <returns> ActorNotFound, InvalidKey, ActorNotHuman, Success. </returns>
-    /// <remarks>
-    /// The player does not have to be currently available as long as he has a persisted Glamourer state.<br/>
-    /// Only players are checked for name equality, no NPCs.<br/>
-    /// If multiple players of the same name are found, all of them are manipulated.<br/>
-    /// Prefer to use the index-based function unless you need to get the state of someone currently unavailable.
-    /// </remarks>
-    public GlamourerApiEc ApplyStateName(object applyState, string playerName, uint key, ApplyFlag flags);
-
-    /// <summary> Revert the Glamourer state of an actor to Game state. </summary>
-    /// <param name="objectIndex"> The game object index of the actor to be manipulated. </param>
-    /// <param name="key"> A key to unlock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Equipment and Customization (see <see cref="ApplyFlag"/>.) </param>
-    /// <returns> ActorNotFound, InvalidKey, Success, NothingDone. </returns>
-    public GlamourerApiEc RevertState(int objectIndex, uint key, ApplyFlag flags);
-
-    /// <summary> Revert the Glamourer state of players to game state. </summary>
-    /// <param name="playerName"> The name of the players to be reverted. </param>
-    /// <param name="key"> A key to unlock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Equipment and Customization (see <see cref="ApplyFlag"/>.) </param>
-    /// <returns> ActorNotFound, InvalidKey, Success, NothingDone. </returns>
-    /// /// <remarks>
-    /// The player does not have to be currently available as long as he has a persisted Glamourer state.<br/>
-    /// Only players are checked for name equality, no NPCs.<br/>
-    /// If multiple players of the same name are found, all of them are reverted.<br/>
-    /// Prefer to use the index-based function unless you need to get the state of someone currently unavailable.
-    /// </remarks>
-    public GlamourerApiEc RevertStateName(string playerName, uint key, ApplyFlag flags);
-
-    /// <summary> Unlock the Glamourer state of an actor with a key. </summary>
-    /// <param name="objectIndex"> The game object index of the actor to be manipulated. </param>
-    /// <param name="key"> A key to unlock the state. </param>
-    /// <returns> ActorNotFound, InvalidKey, Success, NothingDone. </returns>
-    public GlamourerApiEc UnlockState(int objectIndex, uint key);
-
-    /// <summary> Unlock the Glamourer state of players with a key. </summary>
-    /// <param name="playerName"> The name of the players to be unlocked. </param>
-    /// <param name="key"> A key to unlock the state. </param>
-    /// <returns> InvalidKey, Success, NothingDone. </returns>
-    public GlamourerApiEc UnlockStateName(string playerName, uint key);
-
-    /// <summary> Unlock all active glamourer states with a key. </summary>
-    /// <param name="key"> The key to unlock states with. </param>
-    /// <returns> The number of unlocked states. </returns>
-    public int UnlockAll(uint key);
-
-    /// <summary> Revert the Glamourer state of an actor to automation state. </summary>
-    /// <param name="objectIndex"> The game object index of the actor to be manipulated. </param>
-    /// <param name="key"> A key to unlock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once and Lock (see <see cref="ApplyFlag"/>.) </param>
-    /// <returns> ActorNotFound, InvalidKey, Success, NothingDone. </returns>
-    public GlamourerApiEc RevertToAutomation(int objectIndex, uint key, ApplyFlag flags);
-
-    /// <summary> Revert the Glamourer state of players to automation state. </summary>
-    /// <param name="playerName"> The name of the players to be reverted. </param>
-    /// <param name="key"> A key to unlock the state if necessary. </param>
-    /// <param name="flags"> The flags used for the reversion. Respects Once and Lock (see <see cref="ApplyFlag"/>.) </param>
-    /// <returns> ActorNotFound, InvalidKey, Success, NothingDone. </returns>
-    /// /// <remarks>
-    /// The player does not have to be currently available as long as he has a persisted Glamourer state.<br/>
-    /// Only players are checked for name equality, no NPCs.<br/>
-    /// If multiple players of the same name are found, all of them are reverted.<br/>
-    /// Prefer to use the index-based function unless you need to get the state of someone currently unavailable.
-    /// </remarks>
-    public GlamourerApiEc RevertToAutomationName(string playerName, uint key, ApplyFlag flags);
-
-    /// <summary> Invoked with the game object pointer (if available) whenever an actors tracked state changes. </summary>
-    public event Action<nint> StateChanged;
-
-    /// <summary> Invoked with the game object pointer (if available) whenever an actors tracked state changes, with the type of change. </summary>
-    public event Action<nint, StateChangeType> StateChangedWithType;
-
-    /// <summary> Invoked with the game object pointer (if available) whenever an actors tracked state finalizes a grouped change consisting of multiple smaller changes. </summary>
-    public event Action<nint, StateFinalizationType> StateFinalized;
-
-    /// <summary> Invoked when the player enters or leaves GPose (true => entered GPose, false => left GPose). </summary>
-    public event Action<bool>? GPoseChanged;
-}

Glamourer.Api/Enums/ApiBonusSlot.cs

@@ -1,11 +0,0 @@
-namespace Glamourer.Api.Enums;
-
-/// <summary> Bonus item slots restricted to API-relevant slots. </summary>
-public enum ApiBonusSlot : byte
-{
-    /// <summary> No slot. </summary>
-    Unknown = 0,
-
-    /// <summary> The Glasses slot. </summary>
-    Glasses = 1,
-}

Glamourer.Api/Enums/ApiEquipSlot.cs

@@ -1,45 +0,0 @@
-namespace Glamourer.Api.Enums;
-
-/// <summary> Equip slots restricted to API-relevant slots, but compatible with GameData.EquipSlots. </summary>
-public enum ApiEquipSlot : byte
-{
-    /// <summary> No slot. </summary>
-    Unknown = 0,
-
-    /// <summary> Mainhand, also used for both-handed weapons. </summary>
-    MainHand = 1,
-
-    /// <summary> Offhand, used for shields or if you want to apply the offhand component of certain weapons. </summary>
-    OffHand = 2,
-
-    /// <summary> Head. </summary>
-    Head = 3,
-
-    /// <summary> Body. </summary>
-    Body = 4,
-
-    /// <summary> Hands. </summary>
-    Hands = 5,
-
-    /// <summary> Legs. </summary>
-    Legs = 7,
-
-    /// <summary> Feet. </summary>
-    Feet = 8,
-
-    /// <summary> Ears. </summary>
-    Ears = 9,
-
-    /// <summary> Neck. </summary>
-    Neck = 10,
-
-    /// <summary> Wrists. </summary>
-    Wrists = 11,
-
-    /// <summary> Right Finger. </summary>
-    RFinger = 12,
-
-    /// <summary> Left Finger. </summary>
-    /// <remarks> Not officially existing, means "weapon could be equipped in either hand" for the game. </remarks>
-    LFinger = 14,
-}

Glamourer.Api/Enums/ApplyFlag.cs

@@ -1,31 +0,0 @@
-namespace Glamourer.Api.Enums;
-
-/// <summary> Application flags that can be used in different situations. </summary>
-[Flags]
-public enum ApplyFlag : ulong
-{
-    /// <summary> Apply the selected manipulation only once, without forcing the state into automation. </summary>
-    Once = 0x01,
-
-    /// <summary> Apply the selected manipulation on the equipment (might be more or less supported). </summary>
-    Equipment = 0x02,
-
-    /// <summary> Apply the selected manipulation on the customizations (might be more or less supported). </summary>
-    Customization = 0x04,
-
-    /// <summary> Lock the state with the given key after applying the selected manipulation </summary>
-    Lock = 0x08,
-}
-
-/// <summary> Extensions for apply flags. </summary>
-public static class ApplyFlagEx
-{
-    /// <summary> The default application flags for design-based manipulations. </summary>
-    public const ApplyFlag DesignDefault = ApplyFlag.Once | ApplyFlag.Equipment | ApplyFlag.Customization;
-
-    /// <summary> The default application flags for state-based manipulations. </summary>
-    public const ApplyFlag StateDefault = ApplyFlag.Equipment | ApplyFlag.Customization | ApplyFlag.Lock;
-
-    /// <summary> The default application flags for reverse manipulations. </summary>
-    public const ApplyFlag RevertDefault = ApplyFlag.Equipment | ApplyFlag.Customization;
-}

Glamourer.Api/Enums/GlamourerApiEc.cs

@@ -1,29 +0,0 @@
-namespace Glamourer.Api.Enums;
-
-/// <summary> Return codes for API functions. </summary>
-public enum GlamourerApiEc
-{
-    /// <summary> The function succeeded. </summary>
-    Success = 0,
-
-    /// <summary> The function did not encounter a problem, but also did not do anything. </summary>
-    NothingDone = 1,
-
-    /// <summary> The requested actor was not found. </summary>
-    ActorNotFound = 2,
-
-    /// <summary> The requested actor was not human, but should have been. </summary>
-    ActorNotHuman,
-
-    /// <summary> The requested design was not found. </summary>
-    DesignNotFound,
-
-    /// <summary> The requested item was not found or could not be applied to the requested slot. </summary>
-    ItemInvalid,
-
-    /// <summary> The state of an actor could not be manipulated because it was locked and the provided key could not unlock it. </summary>
-    InvalidKey,
-
-    /// <summary> The provided object could not be converted into a valid Glamourer state to apply. </summary>
-    InvalidState,
-}

Glamourer.Api/Enums/SetMetaFlag.cs

@@ -1,11 +0,0 @@
-namespace Glamourer.Api.Enums;
-
-/// <summary> Application flags for setting the meta state of an actor. </summary>
-[Flags]
-public enum MetaFlag : ulong
-{
-    Wetness = 0x01,
-    HatState = 0x02,
-    VisorState = 0x04,
-    WeaponState = 0x08,
-}

Glamourer.Api/Enums/StateChangeType.cs

@@ -1,47 +0,0 @@
-namespace Glamourer.Api.Enums;
-
-/// <summary> What type of information changed in a state. </summary>
-public enum StateChangeType
-{
-    /// <summary> A characters saved state had the model id changed. This means everything may have changed. </summary>
-    Model = 0,
-
-    /// <summary> A characters saved state had multiple customization values changed. </summary>
-    EntireCustomize = 1,
-
-    /// <summary> A characters saved state had a customization value changed. </summary>
-    Customize = 2,
-
-    /// <summary> A characters saved state had an equipment piece changed. </summary>
-    Equip = 3,
-
-    /// <summary> A characters saved state had its weapons changed. </summary>
-    Weapon = 4,
-
-    /// <summary> A characters saved state had a stain changed. </summary>
-    Stains = 5,
-
-    /// <summary> A characters saved state had a crest visibility changed. </summary>
-    Crest = 6,
-
-    /// <summary> A characters saved state had its customize parameter changed. </summary>
-    Parameter = 7,
-
-    /// <summary> A characters saved state had a material color table value changed. </summary>
-    MaterialValue = 8,
-
-    /// <summary> A characters saved state had a design applied. This means everything may have changed. </summary>
-    Design = 9,
-
-    /// <summary> A characters saved state had its state reset to its game values. </summary>
-    Reset = 10,
-
-    /// <summary> A characters saved state had a meta toggle changed. </summary>
-    Other = 11,
-
-    /// <summary> A characters state was reapplied. Data is null. </summary>
-    Reapply = 12,
-
-    /// <summary> A characters saved state had a bonus item changed. </summary>
-    BonusItem = 13,
-}

Glamourer.Api/Enums/StateFinalizationType.cs

@@ -1,36 +0,0 @@
-namespace Glamourer.Api.Enums;
-
-/// <summary> What type of Glamourer process was performed on the actors state to update it. </summary>
-public enum StateFinalizationType
-{
-    /// <summary> A characters saved state had the model id altered. </summary>
-    ModelChange = 0,
-
-    /// <summary> A singular Design was applied to an actors state. </summary>
-    DesignApplied = 1,
-
-    /// <summary> A characters saved state had been reset to game values. </summary>
-    Revert = 2,
-
-    /// <summary> A characters saved state had only its customization data reset to game state. </summary>
-    RevertCustomize = 3,
-
-    /// <summary> A characters saved state had only its equipment data reset to game state. </summary>
-    RevertEquipment = 4,
-
-    /// <summary> A characters saved state had its advanced values reverted to game state. </summary>
-    RevertAdvanced = 5,
-
-    /// <summary> A characters saved state was reverted to automation state on top of their game state </summary>
-    RevertAutomation = 6,
-
-    /// <summary> A characters saved state had a generic reapply as a single operation. </summary>
-    Reapply = 7,
-
-    /// <summary> A characters saved state had their automation state reapplied over their existing state. </summary>
-    ReapplyAutomation = 8,
-
-    /// <summary> A characters save state finished applying all updated slots for game state on gearset change or initial load. </summary>
-    Gearset = 9,
-}
-

Glamourer.Api/Glamourer.Api.csproj

@@ -1,34 +0,0 @@
-<Project Sdk="Dalamud.NET.Sdk/13.0.0">
-    <PropertyGroup>
-        <AssemblyTitle>Glamourer.Api</AssemblyTitle>
-        <Product>Glamourer</Product>
-        <Copyright>Copyright © 2025</Copyright>
-        <FileVersion>2.4.1.0</FileVersion>
-        <AssemblyVersion>2.4.1.0</AssemblyVersion>
-        <PackageVersion>2.4.1</PackageVersion>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-        <OutputPath>bin\$(Configuration)\</OutputPath>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <Title>Glamourer.Api</Title>
-        <Authors>Ottermandias</Authors>
-        <RepositoryUrl>https://github.com/Ottermandias/Glamourer</RepositoryUrl>
-        <Description>Auxiliary functions for Glamourers external API.</Description>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <Use_DalamudPackager>false</Use_DalamudPackager>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <NoWarn>1591</NoWarn>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="README.md" Pack="true" PackagePath="\" />
-    </ItemGroup>
-</Project>

Glamourer.Api/Glamourer.Api.csproj.DotSettings

@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ipc/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Glamourer.Api/GlobalUsings.cs

@@ -1,4 +0,0 @@
-// Global using directives
-
-global using System;
-global using System.Collections.Generic;

Glamourer.Api/Helpers/ActionSubscriber.cs

@@ -1,114 +0,0 @@
-using Dalamud.Plugin;
-using Dalamud.Plugin.Ipc;
-
-namespace Glamourer.Api.Helpers;
-
-/// <summary>
-/// Specialized subscriber only allowing to invoke actions.
-/// </summary>
-public class ActionSubscriber
-{
-    private readonly ICallGateSubscriber<object?>? _subscriber;
-
-    /// <summary> Whether the subscriber could successfully be created. </summary>
-    public bool Valid
-        => _subscriber != null;
-
-    protected ActionSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<object?>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <summary> Invoke the action. See the source of the subscriber for details.</summary>
-    protected void Invoke()
-        => _subscriber?.InvokeAction();
-}
-
-/// <inheritdoc cref="ActionSubscriber"/> 
-public class ActionSubscriber<T1>
-{
-    private readonly ICallGateSubscriber<T1, object?>? _subscriber;
-
-    /// <summary> Whether the subscriber could successfully be created. </summary>
-    public bool Valid
-        => _subscriber != null;
-
-    protected ActionSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, object?>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <summary> Invoke the action. See the source of the subscriber for details.</summary>
-    protected void Invoke(T1 a)
-        => _subscriber?.InvokeAction(a);
-}
-
-/// <inheritdoc cref="ActionSubscriber"/> 
-public class ActionSubscriber<T1, T2>
-{
-    private readonly ICallGateSubscriber<T1, T2, object?>? _subscriber;
-
-    /// <inheritdoc cref="ActionSubscriber{T1}.Valid"/> 
-    public bool Valid
-        => _subscriber != null;
-
-    protected ActionSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, object?>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <inheritdoc cref="ActionSubscriber.Invoke"/> 
-    protected void Invoke(T1 a, T2 b)
-        => _subscriber?.InvokeAction(a, b);
-}
-
-/// <inheritdoc cref="ActionSubscriber"/> 
-public class ActionSubscriber<T1, T2, T3>
-{
-    private readonly ICallGateSubscriber<T1, T2, T3, object?>? _subscriber;
-
-    /// <inheritdoc cref="ActionSubscriber{T1}.Valid"/> 
-    public bool Valid
-        => _subscriber != null;
-
-    protected ActionSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, T3, object?>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <inheritdoc cref="ActionSubscriber.Invoke"/> 
-    protected void Invoke(T1 a, T2 b, T3 c)
-        => _subscriber?.InvokeAction(a, b, c);
-}

Glamourer.Api/Helpers/EventProvider.cs

@@ -1,234 +0,0 @@
-using Dalamud.Plugin;
-using Dalamud.Plugin.Ipc;
-using Dalamud.Plugin.Services;
-
-namespace Glamourer.Api.Helpers;
-
-/// <summary>
-/// Specialized disposable Provider for Events.<para />
-/// Will execute the unsubscriber action on dispose if any is provided.<para />
-/// Can only be invoked and disposed.
-/// </summary>
-public sealed class EventProvider : IDisposable
-{
-    private readonly IPluginLog                  _log;
-    private          ICallGateProvider<object?>? _provider;
-    private          Delegate?                   _unsubscriber;
-
-    public EventProvider(IDalamudPluginInterface pi, string label, (Action<Action> Add, Action<Action> Del)? subscribe = null)
-    {
-        _unsubscriber = null;
-        _log          = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _provider = pi.GetIpcProvider<object?>(label);
-            subscribe?.Add(Invoke);
-            _unsubscriber = subscribe?.Del;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-    }
-
-    public EventProvider(IDalamudPluginInterface pi, string label, Action<EventProvider> add, Action<EventProvider> del)
-    {
-        _unsubscriber = null;
-        _log          = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _provider = pi.GetIpcProvider<object?>(label);
-            add(this);
-            _unsubscriber = del;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-    }
-
-    /// <summary> Invoke the event.</summary>
-    public void Invoke()
-    {
-        try
-        {
-            _provider?.SendMessage();
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Exception thrown on IPC event:\n{e}");
-        }
-    }
-
-    public void Dispose()
-    {
-        switch (_unsubscriber)
-        {
-            case Action<Action> a:
-                a(Invoke);
-                break;
-            case Action<EventProvider> b:
-                b(this);
-                break;
-        }
-
-        _unsubscriber = null;
-        _provider     = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~EventProvider()
-        => Dispose();
-}
-
-/// <inheritdoc cref="EventProvider"/>
-public sealed class EventProvider<T1> : IDisposable
-{
-    private readonly IPluginLog                      _log;
-    private          ICallGateProvider<T1, object?>? _provider;
-    private          Delegate?                       _unsubscriber;
-
-    public EventProvider(IDalamudPluginInterface pi, string label, (Action<Action<T1>> Add, Action<Action<T1>> Del)? subscribe = null)
-    {
-        _unsubscriber = null;
-        _log          = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, object?>(label);
-            subscribe?.Add(Invoke);
-            _unsubscriber = subscribe?.Del;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-    }
-
-    public EventProvider(IDalamudPluginInterface pi, string label, Action<EventProvider<T1>> add, Action<EventProvider<T1>> del)
-    {
-        _unsubscriber = null;
-        _log          = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, object?>(label);
-            add(this);
-            _unsubscriber = del;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-    }
-
-    /// <inheritdoc cref="EventProvider.Invoke"/>
-    public void Invoke(T1 a)
-    {
-        try
-        {
-            _provider?.SendMessage(a);
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Exception thrown on IPC event:\n{e}");
-        }
-    }
-
-    public void Dispose()
-    {
-        switch (_unsubscriber)
-        {
-            case Action<Action<T1>> a:
-                a(Invoke);
-                break;
-            case Action<EventProvider<T1>> b:
-                b(this);
-                break;
-        }
-
-        _unsubscriber = null;
-        _provider     = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~EventProvider()
-        => Dispose();
-}
-
-/// <inheritdoc cref="EventProvider"/>
-public sealed class EventProvider<T1, T2> : IDisposable
-{
-    private readonly IPluginLog                          _log;
-    private          ICallGateProvider<T1, T2, object?>? _provider;
-    private          Delegate?                           _unsubscriber;
-
-    public EventProvider(IDalamudPluginInterface pi, string label, (Action<Action<T1, T2>> Add, Action<Action<T1, T2>> Del)? subscribe = null)
-    {
-        _unsubscriber = null;
-        _log          = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, T2, object?>(label);
-            subscribe?.Add(Invoke);
-            _unsubscriber = subscribe?.Del;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-    }
-
-    public EventProvider(IDalamudPluginInterface pi, string label, Action<EventProvider<T1, T2>> add, Action<EventProvider<T1, T2>> del)
-    {
-        _unsubscriber = null;
-        _log          = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, T2, object?>(label);
-            add(this);
-            _unsubscriber = del;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-    }
-
-    /// <inheritdoc cref="EventProvider.Invoke"/>
-    public void Invoke(T1 a, T2 b)
-    {
-        try
-        {
-            _provider?.SendMessage(a, b);
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Exception thrown on IPC event:\n{e}");
-        }
-    }
-
-    public void Dispose()
-    {
-        switch (_unsubscriber)
-        {
-            case Action<Action<T1, T2>> a:
-                a(Invoke);
-                break;
-            case Action<EventProvider<T1, T2>> b:
-                b(this);
-                break;
-        }
-
-        _unsubscriber = null;
-        _provider     = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~EventProvider()
-        => Dispose();
-}

Glamourer.Api/Helpers/EventSubscriber.cs

@@ -1,394 +0,0 @@
-using Dalamud.Plugin;
-using Dalamud.Plugin.Ipc;
-using Dalamud.Plugin.Services;
-
-namespace Glamourer.Api.Helpers;
-
-/// <summary>
-/// Specialized disposable Subscriber for Events.<para />
-/// Subscriptions are wrapped to be individually exception-safe.<para/>
-/// Can be enabled and disabled.<para/>
-/// </summary>
-public sealed class EventSubscriber : IDisposable
-{
-    private readonly string                        _label;
-    private readonly IPluginLog                    _log;
-    private readonly Dictionary<Action, Action>    _delegates = new();
-    private          ICallGateSubscriber<object?>? _subscriber;
-    private          bool                          _disabled;
-
-    public EventSubscriber(IDalamudPluginInterface pi, string label, params Action[] actions)
-    {
-        _label = label;
-        _log   = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<object?>(label);
-            foreach (var action in actions)
-                Event += action;
-
-            _disabled = false;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <summary>
-    /// Enable all currently subscribed actions registered with this EventSubscriber.
-    /// Does nothing if it is already enabled.
-    /// </summary>
-    public void Enable()
-    {
-        if (_disabled && _subscriber != null)
-        {
-            foreach (var action in _delegates.Values)
-                _subscriber.Subscribe(action);
-
-            _disabled = false;
-        }
-    }
-
-    /// <summary>
-    /// Disable all subscribed actions registered with this EventSubscriber.
-    /// Does nothing if it is already disabled.
-    /// Does not forget the actions, only disables them.
-    /// </summary>
-    public void Disable()
-    {
-        if (!_disabled)
-        {
-            if (_subscriber != null)
-                foreach (var action in _delegates.Values)
-                    _subscriber.Unsubscribe(action);
-
-            _disabled = true;
-        }
-    }
-
-    /// <summary>
-    /// Add or remove an action to the IPC event, if it is valid.
-    /// </summary>
-    public event Action Event
-    {
-        add
-        {
-            if (_subscriber != null && !_delegates.ContainsKey(value))
-            {
-                void Action()
-                {
-                    try
-                    {
-                        value();
-                    }
-                    catch (Exception e)
-                    {
-                        _log.Error($"Exception invoking IPC event {_label}:\n{e}");
-                    }
-                }
-
-                if (_delegates.TryAdd(value, Action) && !_disabled)
-                    _subscriber.Subscribe(Action);
-            }
-        }
-        remove
-        {
-            if (_subscriber != null && _delegates.Remove(value, out var action))
-                _subscriber.Unsubscribe(action);
-        }
-    }
-
-    public void Dispose()
-    {
-        Disable();
-        _subscriber = null;
-        _delegates.Clear();
-    }
-
-    ~EventSubscriber()
-        => Dispose();
-}
-
-/// <summary><inheritdoc cref="EventSubscriber"/> </summary>
-public sealed class EventSubscriber<T1> : IDisposable
-{
-    private readonly string                             _label;
-    private readonly IPluginLog                         _log;
-    private readonly Dictionary<Action<T1>, Action<T1>> _delegates = new();
-    private          ICallGateSubscriber<T1, object?>?  _subscriber;
-    private          bool                               _disabled;
-
-    public EventSubscriber(IDalamudPluginInterface pi, string label, params Action<T1>[] actions)
-    {
-        _label = label;
-        _log   = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, object?>(label);
-            foreach (var action in actions)
-                Event += action;
-
-            _disabled = false;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Enable"/> </summary>
-    public void Enable()
-    {
-        if (_disabled && _subscriber != null)
-        {
-            foreach (var action in _delegates.Values)
-                _subscriber.Subscribe(action);
-
-            _disabled = false;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Disable"/> </summary>
-    public void Disable()
-    {
-        if (!_disabled)
-        {
-            if (_subscriber != null)
-                foreach (var action in _delegates.Values)
-                    _subscriber.Unsubscribe(action);
-
-            _disabled = true;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Event"/> </summary>
-    public event Action<T1> Event
-    {
-        add
-        {
-            if (_subscriber != null && !_delegates.ContainsKey(value))
-            {
-                void Action(T1 a)
-                {
-                    try
-                    {
-                        value(a);
-                    }
-                    catch (Exception e)
-                    {
-                        _log.Error($"Exception invoking IPC event {_label}:\n{e}");
-                    }
-                }
-
-                if (_delegates.TryAdd(value, Action) && !_disabled)
-                    _subscriber.Subscribe(Action);
-            }
-        }
-        remove
-        {
-            if (_subscriber != null && _delegates.Remove(value, out var action))
-                _subscriber.Unsubscribe(action);
-        }
-    }
-
-    public void Dispose()
-    {
-        Disable();
-        _subscriber = null;
-        _delegates.Clear();
-    }
-
-    ~EventSubscriber()
-        => Dispose();
-}
-
-/// <summary><inheritdoc cref="EventSubscriber"/> </summary>
-public sealed class EventSubscriber<T1, T2> : IDisposable
-{
-    private readonly string                                     _label;
-    private readonly IPluginLog                                 _log;
-    private readonly Dictionary<Action<T1, T2>, Action<T1, T2>> _delegates = new();
-    private          ICallGateSubscriber<T1, T2, object?>?      _subscriber;
-    private          bool                                       _disabled;
-
-    public EventSubscriber(IDalamudPluginInterface pi, string label, params Action<T1, T2>[] actions)
-    {
-        _label = label;
-        _log = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, object?>(label);
-            foreach (var action in actions)
-                Event += action;
-
-            _disabled = false;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Enable"/> </summary>
-    public void Enable()
-    {
-        if (_disabled && _subscriber != null)
-        {
-            foreach (var action in _delegates.Values)
-                _subscriber.Subscribe(action);
-
-            _disabled = false;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Disable"/> </summary>
-    public void Disable()
-    {
-        if (!_disabled)
-        {
-            if (_subscriber != null)
-                foreach (var action in _delegates.Values)
-                    _subscriber.Unsubscribe(action);
-
-            _disabled = true;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Event"/> </summary>
-    public event Action<T1, T2> Event
-    {
-        add
-        {
-            if (_subscriber != null && !_delegates.ContainsKey(value))
-            {
-                void Action(T1 a, T2 b)
-                {
-                    try
-                    {
-                        value(a, b);
-                    }
-                    catch (Exception e)
-                    {
-                        _log.Error($"Exception invoking IPC event {_label}:\n{e}");
-                    }
-                }
-
-                if (_delegates.TryAdd(value, Action) && !_disabled)
-                    _subscriber.Subscribe(Action);
-            }
-        }
-        remove
-        {
-            if (_subscriber != null && _delegates.Remove(value, out var action))
-                _subscriber.Unsubscribe(action);
-        }
-    }
-
-    public void Dispose()
-    {
-        Disable();
-        _subscriber = null;
-        _delegates.Clear();
-    }
-
-    ~EventSubscriber()
-        => Dispose();
-}
-
-/// <summary><inheritdoc cref="EventSubscriber"/> </summary>
-public sealed class EventSubscriber<T1, T2, T3> : IDisposable
-{
-    private readonly string                                             _label;
-    private readonly IPluginLog                                         _log;
-    private readonly Dictionary<Action<T1, T2, T3>, Action<T1, T2, T3>> _delegates = new();
-    private          ICallGateSubscriber<T1, T2, T3, object?>?          _subscriber;
-    private          bool                                               _disabled;
-
-    public EventSubscriber(IDalamudPluginInterface pi, string label, params Action<T1, T2, T3>[] actions)
-    {
-        _label = label;
-        _log   = PluginLogHelper.GetLog(pi);
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, T3, object?>(label);
-            foreach (var action in actions)
-                Event += action;
-
-            _disabled = false;
-        }
-        catch (Exception e)
-        {
-            _log.Error($"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Enable"/> </summary>
-    public void Enable()
-    {
-        if (_disabled && _subscriber != null)
-        {
-            foreach (var action in _delegates.Values)
-                _subscriber.Subscribe(action);
-
-            _disabled = false;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Disable"/> </summary>
-    public void Disable()
-    {
-        if (!_disabled)
-        {
-            if (_subscriber != null)
-                foreach (var action in _delegates.Values)
-                    _subscriber.Unsubscribe(action);
-
-            _disabled = true;
-        }
-    }
-
-    /// <summary><inheritdoc cref="EventSubscriber.Event"/> </summary>
-    public event Action<T1, T2, T3> Event
-    {
-        add
-        {
-            if (_subscriber != null && !_delegates.ContainsKey(value))
-            {
-                void Action(T1 a, T2 b, T3 c)
-                {
-                    try
-                    {
-                        value(a, b, c);
-                    }
-                    catch (Exception e)
-                    {
-                        _log.Error($"Exception invoking IPC event {_label}:\n{e}");
-                    }
-                }
-
-                if (_delegates.TryAdd(value, Action) && !_disabled)
-                    _subscriber.Subscribe(Action);
-            }
-        }
-        remove
-        {
-            if (_subscriber != null && _delegates.Remove(value, out var action))
-                _subscriber.Unsubscribe(action);
-        }
-    }
-
-    public void Dispose()
-    {
-        Disable();
-        _subscriber = null;
-        _delegates.Clear();
-    }
-
-    ~EventSubscriber()
-        => Dispose();
-}

Glamourer.Api/Helpers/FuncProvider.cs

@@ -1,224 +0,0 @@
-using Dalamud.Plugin;
-using Dalamud.Plugin.Ipc;
-
-namespace Glamourer.Api.Helpers;
-
-/// <summary>
-/// Specialized disposable Provider for Funcs.
-/// </summary>
-public sealed class FuncProvider<TRet> : IDisposable
-{
-    private ICallGateProvider<TRet>? _provider;
-
-    public FuncProvider(IDalamudPluginInterface pi, string label, Func<TRet> func)
-    {
-        try
-        {
-            _provider = pi.GetIpcProvider<TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-
-        _provider?.RegisterFunc(func);
-    }
-
-    public void Dispose()
-    {
-        _provider?.UnregisterFunc();
-        _provider = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~FuncProvider()
-        => Dispose();
-}
-
-/// <inheritdoc cref="FuncProvider{TRet}"/>
-public sealed class FuncProvider<T1, TRet> : IDisposable
-{
-    private ICallGateProvider<T1, TRet>? _provider;
-
-    public FuncProvider(IDalamudPluginInterface pi, string label, Func<T1, TRet> func)
-    {
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-
-        _provider?.RegisterFunc(func);
-    }
-
-    public void Dispose()
-    {
-        _provider?.UnregisterFunc();
-        _provider = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~FuncProvider()
-        => Dispose();
-}
-
-/// <inheritdoc cref="FuncProvider{TRet}"/>
-public sealed class FuncProvider<T1, T2, TRet> : IDisposable
-{
-    private ICallGateProvider<T1, T2, TRet>? _provider;
-
-    public FuncProvider(IDalamudPluginInterface pi, string label, Func<T1, T2, TRet> func)
-    {
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, T2, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-
-        _provider?.RegisterFunc(func);
-    }
-
-    public void Dispose()
-    {
-        _provider?.UnregisterFunc();
-        _provider = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~FuncProvider()
-        => Dispose();
-}
-
-/// <inheritdoc cref="FuncProvider{TRet}"/>
-public sealed class FuncProvider<T1, T2, T3, TRet> : IDisposable
-{
-    private ICallGateProvider<T1, T2, T3, TRet>? _provider;
-
-    public FuncProvider(IDalamudPluginInterface pi, string label, Func<T1, T2, T3, TRet> func)
-    {
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, T2, T3, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-
-        _provider?.RegisterFunc(func);
-    }
-
-    public void Dispose()
-    {
-        _provider?.UnregisterFunc();
-        _provider = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~FuncProvider()
-        => Dispose();
-}
-
-/// <inheritdoc cref="FuncProvider{TRet}"/>
-public sealed class FuncProvider<T1, T2, T3, T4, TRet> : IDisposable
-{
-    private ICallGateProvider<T1, T2, T3, T4, TRet>? _provider;
-
-    public FuncProvider(IDalamudPluginInterface pi, string label, Func<T1, T2, T3, T4, TRet> func)
-    {
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, T2, T3, T4, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-
-        _provider?.RegisterFunc(func);
-    }
-
-    public void Dispose()
-    {
-        _provider?.UnregisterFunc();
-        _provider = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~FuncProvider()
-        => Dispose();
-}
-
-/// <inheritdoc cref="FuncProvider{TRet}"/>
-public sealed class FuncProvider<T1, T2, T3, T4, T5, TRet> : IDisposable
-{
-    private ICallGateProvider<T1, T2, T3, T4, T5, TRet>? _provider;
-
-    public FuncProvider(IDalamudPluginInterface pi, string label, Func<T1, T2, T3, T4, T5, TRet> func)
-    {
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, T2, T3, T4, T5, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-
-        _provider?.RegisterFunc(func);
-    }
-
-    public void Dispose()
-    {
-        _provider?.UnregisterFunc();
-        _provider = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~FuncProvider()
-        => Dispose();
-}
-
-
-/// <inheritdoc cref="FuncProvider{TRet}"/>
-public sealed class FuncProvider<T1, T2, T3, T4, T5, T6, TRet> : IDisposable
-{
-    private ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet>? _provider;
-
-    public FuncProvider(IDalamudPluginInterface pi, string label, Func<T1, T2, T3, T4, T5, T6, TRet> func)
-    {
-        try
-        {
-            _provider = pi.GetIpcProvider<T1, T2, T3, T4, T5, T6, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Provider for {label}\n{e}");
-            _provider = null;
-        }
-
-        _provider?.RegisterFunc(func);
-    }
-
-    public void Dispose()
-    {
-        _provider?.UnregisterFunc();
-        _provider = null;
-        GC.SuppressFinalize(this);
-    }
-
-    ~FuncProvider()
-        => Dispose();
-}

Glamourer.Api/Helpers/FuncSubscriber.cs

@@ -1,217 +0,0 @@
-using Dalamud.Plugin;
-using Dalamud.Plugin.Ipc;
-using Dalamud.Plugin.Ipc.Exceptions;
-
-namespace Glamourer.Api.Helpers;
-
-/// <summary>
-/// Specialized subscriber only allowing to invoke functions with a return.
-/// </summary>
-public class FuncSubscriber<TRet>
-{
-    private readonly string                     _label;
-    private readonly ICallGateSubscriber<TRet>? _subscriber;
-
-    /// <summary> Whether the subscriber could successfully be created. </summary>
-    public bool Valid
-        => _subscriber != null;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}"/>
-    protected FuncSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        _label = label;
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <summary> Invoke the function. See the source of the subscriber for details.</summary>
-    protected TRet Invoke()
-        => _subscriber != null ? _subscriber.InvokeFunc() : throw new IpcNotReadyError(_label);
-}
-
-/// <inheritdoc cref="FuncSubscriber{TRet}"/>
-public class FuncSubscriber<T1, TRet>
-{
-    private readonly string                         _label;
-    private readonly ICallGateSubscriber<T1, TRet>? _subscriber;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Valid"/>
-    public bool Valid
-        => _subscriber != null;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}"/>
-    protected FuncSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        _label = label;
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Invoke"/>
-    protected TRet Invoke(T1 a)
-        => _subscriber != null ? _subscriber.InvokeFunc(a) : throw new IpcNotReadyError(_label);
-}
-
-/// <inheritdoc cref="FuncSubscriber{TRet}"/>
-public class FuncSubscriber<T1, T2, TRet>
-{
-    private readonly string                             _label;
-    private readonly ICallGateSubscriber<T1, T2, TRet>? _subscriber;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Valid"/>
-    public bool Valid
-        => _subscriber != null;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}"/>
-    protected FuncSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        _label = label;
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Invoke"/>
-    protected TRet Invoke(T1 a, T2 b)
-        => _subscriber != null ? _subscriber.InvokeFunc(a, b) : throw new IpcNotReadyError(_label);
-}
-
-/// <inheritdoc cref="FuncSubscriber{TRet}"/>
-public class FuncSubscriber<T1, T2, T3, TRet>
-{
-    private readonly string                                 _label;
-    private readonly ICallGateSubscriber<T1, T2, T3, TRet>? _subscriber;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Valid"/>
-    public bool Valid
-        => _subscriber != null;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}"/>
-    protected FuncSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        _label = label;
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, T3, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Invoke"/>
-    protected TRet Invoke(T1 a, T2 b, T3 c)
-        => _subscriber != null ? _subscriber.InvokeFunc(a, b, c) : throw new IpcNotReadyError(_label);
-}
-
-/// <inheritdoc cref="FuncSubscriber{TRet}"/>
-public class FuncSubscriber<T1, T2, T3, T4, TRet>
-{
-    private readonly string                                     _label;
-    private readonly ICallGateSubscriber<T1, T2, T3, T4, TRet>? _subscriber;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Valid"/>
-    public bool Valid
-        => _subscriber != null;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}"/>
-    protected FuncSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        _label = label;
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, T3, T4, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Invoke"/>
-    protected TRet Invoke(T1 a, T2 b, T3 c, T4 d)
-        => _subscriber != null ? _subscriber.InvokeFunc(a, b, c, d) : throw new IpcNotReadyError(_label);
-}
-
-/// <inheritdoc cref="FuncSubscriber{TRet}"/>
-public class FuncSubscriber<T1, T2, T3, T4, T5, TRet>
-{
-    private readonly string                                         _label;
-    private readonly ICallGateSubscriber<T1, T2, T3, T4, T5, TRet>? _subscriber;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Valid"/>
-    public bool Valid
-        => _subscriber != null;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}"/>
-    protected FuncSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        _label = label;
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, T3, T4, T5, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Invoke"/>
-    protected TRet Invoke(T1 a, T2 b, T3 c, T4 d, T5 e)
-        => _subscriber != null ? _subscriber.InvokeFunc(a, b, c, d, e) : throw new IpcNotReadyError(_label);
-}
-
-/// <inheritdoc cref="FuncSubscriber{TRet}"/>
-public class FuncSubscriber<T1, T2, T3, T4, T5, T6, TRet>
-{
-    private readonly string                                             _label;
-    private readonly ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet>? _subscriber;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Valid"/>
-    public bool Valid
-        => _subscriber != null;
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}"/>
-    protected FuncSubscriber(IDalamudPluginInterface pi, string label)
-    {
-        _label = label;
-        try
-        {
-            _subscriber = pi.GetIpcSubscriber<T1, T2, T3, T4, T5, T6, TRet>(label);
-        }
-        catch (Exception e)
-        {
-            PluginLogHelper.WriteError(pi, $"Error registering IPC Subscriber for {label}\n{e}");
-            _subscriber = null;
-        }
-    }
-
-    /// <inheritdoc cref="FuncSubscriber{TRet}.Invoke"/>
-    protected TRet Invoke(T1 a, T2 b, T3 c, T4 d, T5 e, T6 f)
-        => _subscriber != null ? _subscriber.InvokeFunc(a, b, c, d, e, f) : throw new IpcNotReadyError(_label);
-}

Glamourer.Api/Helpers/PluginLogHelper.cs

@@ -1,26 +0,0 @@
-using Dalamud.IoC;
-using Dalamud.Plugin;
-using Dalamud.Plugin.Services;
-
-namespace Glamourer.Api.Helpers;
-
-internal class PluginLogHelper
-{
-    [PluginService]
-    private static IPluginLog? _log { get; set; }
-
-    private PluginLogHelper(IDalamudPluginInterface pi)
-        => pi.Inject(this);
-
-    public static void WriteError(IDalamudPluginInterface pi, string errorMessage)
-        => GetLog(pi).Error(errorMessage);
-
-    public static IPluginLog GetLog(IDalamudPluginInterface pi)
-    {
-        if (_log != null)
-            return _log;
-
-        _ = new PluginLogHelper(pi);
-        return _log!;
-    }
-}

Glamourer.Api/IpcSubscribers/Designs.cs

@@ -1,52 +0,0 @@
-using Dalamud.Plugin;
-using Glamourer.Api.Api;
-using Glamourer.Api.Enums;
-using Glamourer.Api.Helpers;
-
-namespace Glamourer.Api.IpcSubscribers;
-
-/// <inheritdoc cref="IGlamourerApiDesigns.GetDesignList"/>
-public sealed class GetDesignList(IDalamudPluginInterface pi)
-    : FuncSubscriber<Dictionary<Guid, string>>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(GetDesignList)}.V2";
-
-    /// <inheritdoc cref="IGlamourerApiDesigns.GetDesignList"/>
-    public new Dictionary<Guid, string> Invoke()
-        => base.Invoke();
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<Dictionary<Guid, string>> Provider(IDalamudPluginInterface pi, IGlamourerApiDesigns api)
-        => new(pi, Label, api.GetDesignList);
-}
-
-/// <inheritdoc cref="IGlamourerApiDesigns.ApplyDesign"/>
-public sealed class ApplyDesign(IDalamudPluginInterface pi) : FuncSubscriber<Guid, int, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(ApplyDesign)}";
-
-    /// <inheritdoc cref="IGlamourerApiDesigns.ApplyDesign"/>
-    public GlamourerApiEc Invoke(Guid designId, int objectIndex, uint key = 0, ApplyFlag flags = ApplyFlagEx.DesignDefault)
-        => (GlamourerApiEc)Invoke(designId, objectIndex, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<Guid, int, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiDesigns api)
-        => new(pi, Label, (a, b, c, d) => (int)api.ApplyDesign(a, b, c, (ApplyFlag)d));
-}
-
-/// <inheritdoc cref="IGlamourerApiDesigns.ApplyDesignName"/>
-public sealed class ApplyDesignName(IDalamudPluginInterface pi) : FuncSubscriber<Guid, string, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(ApplyDesignName)}";
-
-    /// <inheritdoc cref="IGlamourerApiDesigns.ApplyDesignName"/>
-    public GlamourerApiEc Invoke(Guid designId, string objectName, uint key = 0, ApplyFlag flags = ApplyFlagEx.DesignDefault)
-        => (GlamourerApiEc)Invoke(designId, objectName, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<Guid, string, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiDesigns api)
-        => new(pi, Label, (a, b, c, d) => (int)api.ApplyDesignName(a, b, c, (ApplyFlag)d));
-}

Glamourer.Api/IpcSubscribers/Items.cs

@@ -1,110 +0,0 @@
-using Dalamud.Plugin;
-using Glamourer.Api.Api;
-using Glamourer.Api.Enums;
-using Glamourer.Api.Helpers;
-
-namespace Glamourer.Api.IpcSubscribers;
-
-/// <inheritdoc cref="IGlamourerApiItems.SetItem"/>
-public sealed class SetItem(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, byte, ulong, IReadOnlyList<byte>, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(SetItem)}.V3";
-
-    /// <inheritdoc cref="IGlamourerApiItems.SetItem"/>
-    public GlamourerApiEc Invoke(int objectIndex, ApiEquipSlot slot, ulong itemId, IReadOnlyList<byte> stain, uint key = 0,
-        ApplyFlag flags = ApplyFlag.Once)
-        => (GlamourerApiEc)Invoke(objectIndex, (byte)slot, itemId, stain, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<int, byte, ulong, IReadOnlyList<byte>, uint, ulong, int> Provider(IDalamudPluginInterface pi,
-        IGlamourerApiItems api)
-        => new(pi, Label, (a, b, c, d, e, f) => (int)api.SetItem(a, (ApiEquipSlot)b, c, d, e, (ApplyFlag)f));
-}
-
-/// <inheritdoc cref="IGlamourerApiItems.SetItemName"/>
-public sealed class SetItemName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, byte, ulong, IReadOnlyList<byte>, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(SetItemName)}.V2";
-
-    /// <inheritdoc cref="IGlamourerApiItems.SetItem"/>
-    public GlamourerApiEc Invoke(string objectName, ApiEquipSlot slot, ulong itemId, IReadOnlyList<byte> stain, uint key = 0,
-        ApplyFlag flags = ApplyFlag.Once)
-        => (GlamourerApiEc)Invoke(objectName, (byte)slot, itemId, stain, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<string, byte, ulong, IReadOnlyList<byte>, uint, ulong, int> Provider(IDalamudPluginInterface pi,
-        IGlamourerApiItems api)
-        => new(pi, Label, (a, b, c, d, e, f) => (int)api.SetItemName(a, (ApiEquipSlot)b, c, d, e, (ApplyFlag)f));
-}
-
-/// <inheritdoc cref="IGlamourerApiItems.SetBonusItem"/>
-public sealed class SetBonusItem(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, byte, ulong, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(SetBonusItem)}";
-
-    /// <inheritdoc cref="IGlamourerApiItems.SetBonusItem"/>
-    public GlamourerApiEc Invoke(int objectIndex, ApiBonusSlot slot, ulong itemId, uint key = 0, ApplyFlag flags = ApplyFlag.Once)
-        => (GlamourerApiEc)Invoke(objectIndex, (byte)slot, itemId, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<int, byte, ulong, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiItems api)
-        => new(pi, Label, (a, b, c, d, e) => (int)api.SetBonusItem(a, (ApiBonusSlot)b, c, d, (ApplyFlag)e));
-}
-
-/// <inheritdoc cref="IGlamourerApiItems.SetBonusItemName"/>
-public sealed class SetBonusItemName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, byte, ulong, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(SetBonusItemName)}.V2";
-
-    /// <inheritdoc cref="IGlamourerApiItems.SetBonusItemName"/>
-    public GlamourerApiEc Invoke(string objectName, ApiBonusSlot slot, ulong itemId, uint key = 0, ApplyFlag flags = ApplyFlag.Once)
-        => (GlamourerApiEc)Invoke(objectName, (byte)slot, itemId, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<string, byte, ulong, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiItems api)
-        => new(pi, Label, (a, b, c, d, e) => (int)api.SetBonusItemName(a, (ApiBonusSlot)b, c, d, (ApplyFlag)e));
-}
-
-/// <inheritdoc cref="IGlamourerApiItems.SetMetaState"/>
-public sealed class SetMetaState(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, ulong, bool, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(SetMetaState)}";
-
-    /// <inheritdoc cref="IGlamourerApiItems.SetMetaState"/>
-    public GlamourerApiEc Invoke(int objectIndex, MetaFlag types, bool newValue, uint key = 0, 
-        ApplyFlag flags = ApplyFlag.Once)
-        => (GlamourerApiEc)Invoke(objectIndex, (ulong)types, newValue, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<int, ulong, bool, uint, ulong, int> Provider(IDalamudPluginInterface pi, 
-        IGlamourerApiItems api)
-        => new(pi, Label, (a, b, c, d, e) => (int)api.SetMetaState(a, (MetaFlag)b, c, d, (ApplyFlag)e));
-}
-
-/// <inheritdoc cref="IGlamourerApiItems.SetMetaStateName"/>
-public sealed class SetMetaStateName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, ulong, bool, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(SetMetaStateName)}";
-
-    /// <inheritdoc cref="IGlamourerApiItems.SetMetaStateName"/>
-    public GlamourerApiEc Invoke(string objectName, MetaFlag types, bool newValue, uint key = 0, 
-        ApplyFlag flags = ApplyFlag.Once)
-        => (GlamourerApiEc)Invoke(objectName, (ulong)types, newValue, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<string, ulong, bool, uint, ulong, int> Provider(IDalamudPluginInterface pi, 
-        IGlamourerApiItems api)
-        => new(pi, Label, (a, b, c, d, e) => (int)api.SetMetaStateName(a, (MetaFlag)b, c, d, (ApplyFlag)e));
-}

Glamourer.Api/IpcSubscribers/Legacy/Designs.cs

@@ -1,52 +0,0 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Plugin;
-using Glamourer.Api.Helpers;
-
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-
-namespace Glamourer.Api.IpcSubscribers.Legacy;
-
-public sealed class GetDesignList(IDalamudPluginInterface pi)
-    : FuncSubscriber<(string Name, Guid Identifier)[]>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(GetDesignList)}";
-
-    public new (string Name, Guid Identifier)[] Invoke()
-        => base.Invoke();
-}
-
-public sealed class ApplyByGuid(IDalamudPluginInterface pi)
-    : ActionSubscriber<Guid, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyByGuid)}";
-
-    public new void Invoke(Guid design, string name)
-        => base.Invoke(design, name);
-}
-
-public sealed class ApplyByGuidOnce(IDalamudPluginInterface pi)
-    : ActionSubscriber<Guid, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyByGuidOnce)}";
-
-    public new void Invoke(Guid design, string name)
-        => base.Invoke(design, name);
-}
-
-public sealed class ApplyByGuidToCharacter(IDalamudPluginInterface pi)
-    : ActionSubscriber<Guid, ICharacter?>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyByGuidToCharacter)}";
-
-    public new void Invoke(Guid design, ICharacter? character)
-        => base.Invoke(design, character);
-}
-
-public sealed class ApplyByGuidOnceToCharacter(IDalamudPluginInterface pi)
-    : ActionSubscriber<Guid, ICharacter?>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyByGuidOnceToCharacter)}";
-
-    public new void Invoke(Guid design, ICharacter? character)
-        => base.Invoke(design, character);
-}

Glamourer.Api/IpcSubscribers/Legacy/Items.cs

@@ -1,66 +0,0 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Plugin;
-using Glamourer.Api.Api;
-using Glamourer.Api.Enums;
-using Glamourer.Api.Helpers;
-
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-
-namespace Glamourer.Api.IpcSubscribers.Legacy;
-
-public sealed class SetItem(IDalamudPluginInterface pi)
-    : FuncSubscriber<ICharacter?, byte, ulong, byte, uint, int>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(SetItem)}";
-
-    public new GlamourerApiEc Invoke(ICharacter? character, byte slot, ulong itemId, byte stainId, uint key)
-        => (GlamourerApiEc)base.Invoke(character, slot, itemId, stainId, key);
-}
-
-public sealed class SetItemOnce(IDalamudPluginInterface pi)
-    : FuncSubscriber<ICharacter?, byte, ulong, byte, uint, int>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(SetItemOnce)}";
-
-    public new GlamourerApiEc Invoke(ICharacter? character, byte slot, ulong itemId, byte stainId, uint key)
-        => (GlamourerApiEc)base.Invoke(character, slot, itemId, stainId, key);
-}
-
-public sealed class SetItemByActorName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, byte, ulong, byte, uint, int>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(SetItemByActorName)}";
-
-    public new GlamourerApiEc Invoke(string actorName, byte slot, ulong itemId, byte stainId, uint key)
-        => (GlamourerApiEc)base.Invoke(actorName, slot, itemId, stainId, key);
-}
-
-public sealed class SetItemOnceByActorName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, byte, ulong, byte, uint, int>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(SetItemOnceByActorName)}";
-
-    public new GlamourerApiEc Invoke(string actorName, byte slot, ulong itemId, byte stainId, uint key)
-        => (GlamourerApiEc)base.Invoke(actorName, slot, itemId, stainId, key);
-}
-
-public sealed class SetItemV2(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, byte, ulong, byte, uint, ulong, int>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(SetItem)}.V2";
-
-    public GlamourerApiEc Invoke(int objectIndex, ApiEquipSlot slot, ulong itemId, byte stain, uint key = 0, ApplyFlag flags = ApplyFlag.Once)
-        => (GlamourerApiEc)Invoke(objectIndex, (byte)slot, itemId, stain, key, (ulong)flags);
-}
-
-public sealed class SetItemName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, byte, ulong, byte, uint, ulong, int>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(SetItemName)}";
-
-    public GlamourerApiEc Invoke(string objectName, ApiEquipSlot slot, ulong itemId, byte stain, uint key = 0, ApplyFlag flags = ApplyFlag.Once)
-        => (GlamourerApiEc)Invoke(objectName, (byte)slot, itemId, stain, key, (ulong)flags);
-
-    public static FuncProvider<string, byte, ulong, byte, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiItems api)
-        => new(pi, Label, (a, b, c, d, e, f) => (int)api.SetItemName(a, (ApiEquipSlot)b, c, [d], e, (ApplyFlag)f));
-}

Glamourer.Api/IpcSubscribers/Legacy/PluginState.cs

@@ -1,15 +0,0 @@
-using Dalamud.Plugin;
-using Glamourer.Api.Helpers;
-
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-
-namespace Glamourer.Api.IpcSubscribers.Legacy;
-
-public sealed class ApiVersions(IDalamudPluginInterface pi)
-    : FuncSubscriber<(int, int)>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApiVersions)}";
-
-    public new (int Major, int Minor) Invoke()
-        => base.Invoke();
-}

Glamourer.Api/IpcSubscribers/Legacy/State.cs

@@ -1,250 +0,0 @@
-using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Plugin;
-using Glamourer.Api.Helpers;
-
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-
-namespace Glamourer.Api.IpcSubscribers.Legacy;
-
-public sealed class Revert(IDalamudPluginInterface pi)
-    : ActionSubscriber<string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(Revert)}";
-
-    public new void Invoke(string characterName)
-        => base.Invoke(characterName);
-}
-
-public sealed class RevertCharacter(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(RevertCharacter)}";
-
-    public new void Invoke(ICharacter? character)
-        => base.Invoke(character);
-}
-
-public sealed class RevertLock(IDalamudPluginInterface pi)
-    : ActionSubscriber<string, uint>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(RevertLock)}";
-
-    public new void Invoke(string characterName, uint key)
-        => base.Invoke(characterName, key);
-}
-
-public sealed class RevertCharacterLock(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?, uint>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(RevertCharacterLock)}";
-
-    public new void Invoke(ICharacter? character, uint key)
-        => base.Invoke(character, key);
-}
-
-public sealed class RevertToAutomation(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, uint, bool>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(RevertToAutomation)}";
-
-    public new bool Invoke(string characterName, uint key)
-        => base.Invoke(characterName, key);
-}
-
-public sealed class RevertToAutomationCharacter(IDalamudPluginInterface pi)
-    : FuncSubscriber<ICharacter?, uint, bool>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(RevertToAutomationCharacter)}";
-
-    public new bool Invoke(ICharacter? character, uint key)
-        => base.Invoke(character, key);
-}
-
-public sealed class Unlock(IDalamudPluginInterface pi)
-    : FuncSubscriber<ICharacter?, uint, bool>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(Unlock)}";
-
-    public new bool Invoke(ICharacter? character, uint key)
-        => base.Invoke(character, key);
-}
-
-public sealed class UnlockName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, uint, bool>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(UnlockName)}";
-
-    public new bool Invoke(string characterName, uint key)
-        => base.Invoke(characterName, key);
-}
-
-public static class StateChanged
-{
-    public const string Label = $"Penumbra.{nameof(StateChanged)}";
-
-    public static EventSubscriber<int, nint, Lazy<string>> Subscriber(IDalamudPluginInterface pi,
-        params Action<int, nint, Lazy<string>>[] actions)
-        => new(pi, Label, actions);
-}
-
-public sealed class GetAllCustomization(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, string?>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(GetAllCustomization)}";
-
-    public new string? Invoke(string characterName)
-        => base.Invoke(characterName);
-}
-
-public sealed class GetAllCustomizationFromCharacter(IDalamudPluginInterface pi)
-    : FuncSubscriber<ICharacter?, string?>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(GetAllCustomizationFromCharacter)}";
-
-    public new string? Invoke(ICharacter? character)
-        => base.Invoke(character);
-}
-
-public sealed class GetAllCustomizationLocked(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, uint, string?>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(GetAllCustomizationLocked)}";
-
-    public new string? Invoke(string characterName, uint key)
-        => base.Invoke(characterName, key);
-}
-
-public sealed class GetAllCustomizationFromLockedCharacter(IDalamudPluginInterface pi)
-    : FuncSubscriber<ICharacter?, uint, string?>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(GetAllCustomizationFromLockedCharacter)}";
-
-    public new string? Invoke(ICharacter? character, uint key)
-        => base.Invoke(character, key);
-}
-
-public sealed class ApplyAll(IDalamudPluginInterface pi)
-    : ActionSubscriber<string, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyAll)}";
-
-    public new void Invoke(string characterName, string stateBase64)
-        => base.Invoke(characterName, stateBase64);
-}
-
-public sealed class ApplyAllOnce(IDalamudPluginInterface pi)
-    : ActionSubscriber<string, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyAllOnce)}";
-
-    public new void Invoke(string characterName, string stateBase64)
-        => base.Invoke(characterName, stateBase64);
-}
-
-public sealed class ApplyAllToCharacter(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyAllToCharacter)}";
-
-    public new void Invoke(ICharacter? character, string stateBase64)
-        => base.Invoke(character, stateBase64);
-}
-
-public sealed class ApplyAllOnceToCharacter(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyAllOnceToCharacter)}";
-
-    public new void Invoke(ICharacter? character, string stateBase64)
-        => base.Invoke(character, stateBase64);
-}
-
-public sealed class ApplyOnlyEquipment(IDalamudPluginInterface pi)
-    : ActionSubscriber<string, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyOnlyEquipment)}";
-
-    public new void Invoke(string characterName, string stateBase64)
-        => base.Invoke(characterName, stateBase64);
-}
-
-public sealed class ApplyOnlyEquipmentToCharacter(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyOnlyEquipmentToCharacter)}";
-
-    public new void Invoke(ICharacter? character, string stateBase64)
-        => base.Invoke(character, stateBase64);
-}
-
-public sealed class ApplyOnlyCustomization(IDalamudPluginInterface pi)
-    : ActionSubscriber<string, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyOnlyCustomization)}";
-
-    public new void Invoke(string characterName, string stateBase64)
-        => base.Invoke(characterName, stateBase64);
-}
-
-public sealed class ApplyOnlyCustomizationToCharacter(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?, string>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyOnlyCustomizationToCharacter)}";
-
-    public new void Invoke(ICharacter? character, string stateBase64)
-        => base.Invoke(character, stateBase64);
-}
-
-public sealed class ApplyAllLock(IDalamudPluginInterface pi)
-    : ActionSubscriber<string, string, uint>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyAllLock)}";
-
-    public new void Invoke(string characterName, string stateBase64, uint key)
-        => base.Invoke(characterName, stateBase64, key);
-}
-
-public sealed class ApplyAllToCharacterLock(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?, string, uint>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyAllToCharacterLock)}";
-
-    public new void Invoke(ICharacter? character, string stateBase64, uint key)
-        => base.Invoke(character, stateBase64, key);
-}
-
-public sealed class ApplyOnlyEquipmentLock(IDalamudPluginInterface pi)
-    : ActionSubscriber<string, string, uint>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyOnlyEquipmentLock)}";
-
-    public new void Invoke(string characterName, string stateBase64, uint key)
-        => base.Invoke(characterName, stateBase64, key);
-}
-
-public sealed class ApplyOnlyEquipmentToCharacterLock(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?, string, uint>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyOnlyEquipmentToCharacterLock)}";
-
-    public new void Invoke(ICharacter? character, string stateBase64, uint key)
-        => base.Invoke(character, stateBase64, key);
-}
-
-public sealed class ApplyOnlyCustomizationLock(IDalamudPluginInterface pi)
-    : ActionSubscriber<string, string, uint>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyOnlyCustomizationLock)}";
-
-    public new void Invoke(string characterName, string stateBase64, uint key)
-        => base.Invoke(characterName, stateBase64, key);
-}
-
-public sealed class ApplyOnlyCustomizationToCharacterLock(IDalamudPluginInterface pi)
-    : ActionSubscriber<ICharacter?, string, uint>(pi, Label)
-{
-    public const string Label = $"Glamourer.{nameof(ApplyOnlyCustomizationToCharacterLock)}";
-
-    public new void Invoke(ICharacter? character, string stateBase64, uint key)
-        => base.Invoke(character, stateBase64, key);
-}

Glamourer.Api/IpcSubscribers/PluginState.cs

@@ -1,51 +0,0 @@
-using Dalamud.Plugin;
-using Glamourer.Api.Api;
-using Glamourer.Api.Helpers;
-
-namespace Glamourer.Api.IpcSubscribers;
-
-/// <inheritdoc cref="IGlamourerApiBase.ApiVersion"/>
-public sealed class ApiVersion(IDalamudPluginInterface pi)
-    : FuncSubscriber<(int, int)>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(ApiVersion)}.V2";
-
-    /// <inheritdoc cref="IGlamourerApiBase.ApiVersion"/>
-    public new (int Major, int Minor) Invoke()
-        => base.Invoke();
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<(int, int)> Provider(IDalamudPluginInterface pi, IGlamourerApiBase api)
-        => new(pi, Label, () => api.ApiVersion);
-}
-
-/// <summary> Triggered when the Glamourer API is initialized and ready. </summary>
-public static class Initialized
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(Initialized)}";
-
-    /// <summary> Create a new event subscriber. </summary>
-    public static EventSubscriber Subscriber(IDalamudPluginInterface pi, params Action[] actions)
-        => new(pi, Label, actions);
-
-    /// <summary> Create a provider. </summary>
-    public static EventProvider Provider(IDalamudPluginInterface pi)
-        => new(pi, Label);
-}
-
-/// <summary> Triggered when the Glamourer API is fully disposed and unavailable. </summary>
-public static class Disposed
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(Disposed)}";
-
-    /// <summary> Create a new event subscriber. </summary>
-    public static EventSubscriber Subscriber(IDalamudPluginInterface pi, params Action[] actions)
-        => new(pi, Label, actions);
-
-    /// <summary> Create a provider. </summary>
-    public static EventProvider Provider(IDalamudPluginInterface pi)
-        => new(pi, Label);
-}

Glamourer.Api/IpcSubscribers/State.cs

@@ -1,311 +0,0 @@
-using Dalamud.Plugin;
-using Glamourer.Api.Api;
-using Glamourer.Api.Enums;
-using Glamourer.Api.Helpers;
-using Newtonsoft.Json.Linq;
-
-namespace Glamourer.Api.IpcSubscribers;
-
-/// <inheritdoc cref="IGlamourerApiState.GetState"/>
-public sealed class GetState(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, uint, (int, JObject?)>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(GetState)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.GetState"/>
-    public new (GlamourerApiEc, JObject?) Invoke(int objectIndex, uint key = 0)
-    {
-        var (ec, data) = base.Invoke(objectIndex, key);
-        return ((GlamourerApiEc)ec, data);
-    }
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<int, uint, (int, JObject?)> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b) =>
-        {
-            var (ec, data) = api.GetState(a, b);
-            return ((int)ec, data);
-        });
-}
-
-/// <inheritdoc cref="IGlamourerApiState.GetStateName"/>
-public sealed class GetStateName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, uint, (int, JObject?)>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(GetStateName)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.GetStateName"/>
-    public new (GlamourerApiEc, JObject?) Invoke(string objectName, uint key = 0)
-    {
-        var (ec, data) = base.Invoke(objectName, key);
-        return ((GlamourerApiEc)ec, data);
-    }
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<string, uint, (int, JObject?)> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (i, k) =>
-        {
-            var (ec, data) = api.GetStateName(i, k);
-            return ((int)ec, data);
-        });
-}
-
-/// <inheritdoc cref="IGlamourerApiState.GetStateBase64"/>
-public sealed class GetStateBase64(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, uint, (int, string?)>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(GetStateBase64)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.GetStateBase64"/>
-    public new (GlamourerApiEc, string?) Invoke(int objectIndex, uint key = 0)
-    {
-        var (ec, data) = base.Invoke(objectIndex, key);
-        return ((GlamourerApiEc)ec, data);
-    }
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<int, uint, (int, string?)> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b) =>
-        {
-            var (ec, data) = api.GetStateBase64(a, b);
-            return ((int)ec, data);
-        });
-}
-
-/// <inheritdoc cref="IGlamourerApiState.GetStateBase64Name"/>
-public sealed class GetStateBase64Name(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, uint, (int, string?)>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(GetStateBase64Name)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.GetStateBase64Name"/>
-    public new (GlamourerApiEc, string?) Invoke(string objectName, uint key = 0)
-    {
-        var (ec, data) = base.Invoke(objectName, key);
-        return ((GlamourerApiEc)ec, data);
-    }
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<string, uint, (int, string?)> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (i, k) =>
-        {
-            var (ec, data) = api.GetStateBase64Name(i, k);
-            return ((int)ec, data);
-        });
-}
-
-/// <inheritdoc cref="IGlamourerApiState.ApplyState"/>
-public sealed class ApplyState(IDalamudPluginInterface pi)
-    : FuncSubscriber<object, int, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(ApplyState)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.ApplyState"/>
-    public GlamourerApiEc Invoke(JObject state, int objectIndex, uint key = 0, ApplyFlag flags = ApplyFlagEx.StateDefault)
-        => (GlamourerApiEc)Invoke(state, objectIndex, key, (ulong)flags);
-
-    /// <inheritdoc cref="IGlamourerApiState.ApplyState"/>
-    public GlamourerApiEc Invoke(string base64State, int objectIndex, uint key = 0, ApplyFlag flags = ApplyFlagEx.StateDefault)
-        => (GlamourerApiEc)Invoke(base64State, objectIndex, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<object, int, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b, c, d) => (int)api.ApplyState(a, b, c, (ApplyFlag)d));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.ApplyStateName"/>
-public sealed class ApplyStateName(IDalamudPluginInterface pi)
-    : FuncSubscriber<object, string, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(ApplyStateName)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.ApplyState"/>
-    public GlamourerApiEc Invoke(JObject state, string objectName, uint key = 0, ApplyFlag flags = ApplyFlagEx.StateDefault)
-        => (GlamourerApiEc)Invoke(state, objectName, key, (ulong)flags);
-
-    /// <inheritdoc cref="IGlamourerApiState.ApplyState"/>
-    public GlamourerApiEc Invoke(string base64State, string objectName, uint key = 0, ApplyFlag flags = ApplyFlagEx.StateDefault)
-        => (GlamourerApiEc)Invoke(base64State, objectName, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<object, string, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b, c, d) => (int)api.ApplyStateName(a, b, c, (ApplyFlag)d));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.RevertState"/>
-public sealed class RevertState(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(RevertState)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.RevertState"/>
-    public GlamourerApiEc Invoke(int objectIndex, uint key = 0, ApplyFlag flags = ApplyFlagEx.RevertDefault)
-        => (GlamourerApiEc)Invoke(objectIndex, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<int, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b, c) => (int)api.RevertState(a, b, (ApplyFlag)c));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.RevertStateName"/>
-public sealed class RevertStateName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(RevertStateName)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.RevertStateName"/>
-    public GlamourerApiEc Invoke(string objectName, uint key = 0, ApplyFlag flags = ApplyFlagEx.RevertDefault)
-        => (GlamourerApiEc)Invoke(objectName, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<string, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b, c) => (int)api.RevertStateName(a, b, (ApplyFlag)c));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.UnlockState"/>
-public sealed class UnlockState(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, uint, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(UnlockState)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.UnlockState"/>
-    public new GlamourerApiEc Invoke(int objectIndex, uint key = 0)
-        => (GlamourerApiEc)base.Invoke(objectIndex, key);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<int, uint, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b) => (int)api.UnlockState(a, b));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.UnlockStateName"/>
-public sealed class UnlockStateName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, uint, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(UnlockStateName)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.UnlockStateName"/>
-    public new GlamourerApiEc Invoke(string objectName, uint key = 0)
-        => (GlamourerApiEc)base.Invoke(objectName, key);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<string, uint, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b) => (int)api.UnlockStateName(a, b));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.UnlockAll"/>
-public sealed class UnlockAll(IDalamudPluginInterface pi)
-    : FuncSubscriber<uint, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(UnlockAll)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.UnlockAll"/>
-    public new int Invoke(uint key)
-        => base.Invoke(key);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<uint, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, api.UnlockAll);
-}
-
-/// <inheritdoc cref="IGlamourerApiState.RevertToAutomation"/>
-public sealed class RevertToAutomation(IDalamudPluginInterface pi)
-    : FuncSubscriber<int, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(RevertToAutomation)}.V2";
-
-    /// <inheritdoc cref="IGlamourerApiState.RevertToAutomation"/>
-    public GlamourerApiEc Invoke(int objectIndex, uint key = 0, ApplyFlag flags = ApplyFlagEx.RevertDefault)
-        => (GlamourerApiEc)Invoke(objectIndex, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<int, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b, c) => (int)api.RevertToAutomation(a, b, (ApplyFlag)c));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.RevertToAutomationName"/>
-public sealed class RevertToAutomationName(IDalamudPluginInterface pi)
-    : FuncSubscriber<string, uint, ulong, int>(pi, Label)
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Glamourer.{nameof(RevertToAutomationName)}";
-
-    /// <inheritdoc cref="IGlamourerApiState.RevertToAutomationName"/>
-    public GlamourerApiEc Invoke(string objectName, uint key = 0, ApplyFlag flags = ApplyFlagEx.RevertDefault)
-        => (GlamourerApiEc)Invoke(objectName, key, (ulong)flags);
-
-    /// <summary> Create a provider. </summary>
-    public static FuncProvider<string, uint, ulong, int> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (a, b, c) => (int)api.RevertToAutomationName(a, b, (ApplyFlag)c));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.StateChanged" />
-public static class StateChanged
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Penumbra.{nameof(StateChanged)}.V2";
-
-    /// <summary> Create a new event subscriber. </summary>
-    public static EventSubscriber<nint> Subscriber(IDalamudPluginInterface pi, params Action<nint>[] actions)
-        => new(pi, Label, actions);
-
-    /// <summary> Create a provider. </summary>
-    public static EventProvider<nint> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (t => api.StateChanged += t, t => api.StateChanged -= t));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.StateChangedWithType" />
-public static class StateChangedWithType
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Penumbra.{nameof(StateChangedWithType)}";
-
-    /// <summary> Create a new event subscriber. </summary>
-    public static EventSubscriber<nint, StateChangeType> Subscriber(IDalamudPluginInterface pi, params Action<nint, StateChangeType>[] actions)
-        => new(pi, Label, actions);
-
-    /// <summary> Create a provider. </summary>
-    public static EventProvider<nint, StateChangeType> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (t => api.StateChangedWithType += t, t => api.StateChangedWithType -= t));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.StateFinalized" />
-public static class StateFinalized
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Penumbra.{nameof(StateFinalized)}";
-
-    /// <summary> Create a new event subscriber. </summary>
-    public static EventSubscriber<nint, StateFinalizationType> Subscriber(IDalamudPluginInterface pi, params Action<nint, StateFinalizationType>[] actions)
-        => new(pi, Label, actions);
-
-    /// <summary> Create a provider. </summary>
-    public static EventProvider<nint, StateFinalizationType> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (t => api.StateFinalized += t, t => api.StateFinalized -= t));
-}
-
-/// <inheritdoc cref="IGlamourerApiState.GPoseChanged" />
-public static class GPoseChanged
-{
-    /// <summary> The label. </summary>
-    public const string Label = $"Penumbra.{nameof(GPoseChanged)}";
-
-    /// <summary> Create a new event subscriber. </summary>
-    public static EventSubscriber<bool> Subscriber(IDalamudPluginInterface pi, params Action<bool>[] actions)
-        => new(pi, Label, actions);
-
-    /// <summary> Create a provider. </summary>
-    public static EventProvider<bool> Provider(IDalamudPluginInterface pi, IGlamourerApiState api)
-        => new(pi, Label, (t => api.GPoseChanged += t, t => api.GPoseChanged -= t));
-}

Glamourer.Api/README.md

@@ -1,4 +0,0 @@
-# Glamourer
-
-This is an auxiliary repository for Glamourers external API.
-For more information, see the [main repo](https://github.com/Ottermandias/Glamourer).

Glamourer.Api/packages.lock.json

@@ -1,13 +0,0 @@
-{
-  "version": 1,
-  "dependencies": {
-    "net9.0-windows7.0": {
-      "DotNet.ReproducibleBuilds": {
-        "type": "Direct",
-        "requested": "[1.2.25, )",
-        "resolved": "1.2.25",
-        "contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg=="
-      }
-    }
-  }
-}

LICENSE_MIT

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Mare Synchronos
+Copyright (c) 2022 Penumbra-Sync
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MareSynchronos.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32328.378
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos", "MareSynchronos\MareSynchronos.csproj", "{13C812E9-0D42-4B95-8646-40EEBF30636F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "UmbraAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{585B740D-BA2C-429B-9CF3-B2D223423748}"
 	ProjectSection(SolutionItems) = preProject

MareSynchronos/FileCache/FileCacheManager.cs

@@ -236,7 +236,6 @@ public sealed class FileCacheManager : IHostedService
 
             foreach (var entry in cleanedPaths)
             {
-                //_logger.LogDebug("Checking {path}", entry.Value);
 
                 if (dict.TryGetValue(entry.Value, out var entity))
                 {
@@ -366,8 +365,7 @@ public sealed class FileCacheManager : IHostedService
 
         if (!entries.Exists(u => string.Equals(u.PrefixedFilePath, fileCache.PrefixedFilePath, StringComparison.OrdinalIgnoreCase)))
         {
-            //_logger.LogTrace("Adding to DB: {hash} => {path}", fileCache.Hash, fileCache.PrefixedFilePath);
-            entries.Add(fileCache);
+                        entries.Add(fileCache);
         }
     }
 
@@ -389,7 +387,6 @@ public sealed class FileCacheManager : IHostedService
     private FileCacheEntity? GetValidatedFileCache(FileCacheEntity fileCache)
     {
         var resultingFileCache = ReplacePathPrefixes(fileCache);
-        //_logger.LogTrace("Validating {path}", fileCache.PrefixedFilePath);
         resultingFileCache = Validate(resultingFileCache);
         return resultingFileCache;
     }

MareSynchronos/Interop/Ipc/IpcCallerBrio.cs

@@ -95,8 +95,6 @@ public sealed class IpcCallerBrio : IIpcCaller
         if (gameObject == null) return default;
         var data = await _dalamudUtilService.RunOnFrameworkThread(() => _brioGetModelTransform.InvokeFunc(gameObject)).ConfigureAwait(false);
         if (data.Item1 == null || data.Item2 == null || data.Item3 == null) return default;
-        //_logger.LogDebug("Getting Transform from Actor {actor}", gameObject.Name.TextValue);
-
         return new WorldData()
         {
             PositionX = data.Item1.Value.X,

MareSynchronos/MareConfiguration/ConfigurationMigrator.cs

@@ -1,15 +1,72 @@
 using MareSynchronos.WebAPI;
+using System.Text.Json;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace MareSynchronos.MareConfiguration;
 
-public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger) : IHostedService
+public class ConfigurationMigrator(ILogger<ConfigurationMigrator> logger, MareConfigService mareConfig) : IHostedService
 {
     private readonly ILogger<ConfigurationMigrator> _logger = logger;
+    private readonly MareConfigService _mareConfig = mareConfig;
 
     public void Migrate()
     {
+        try
+        {
+            var path = _mareConfig.ConfigurationPath;
+            if (!File.Exists(path)) return;
+
+            using var doc = JsonDocument.Parse(File.ReadAllText(path));
+            var root = doc.RootElement;
+
+            bool changed = false;
+
+            if (root.TryGetProperty("EnableAutoSyncDiscovery", out var enableAutoSync))
+            {
+                var val = enableAutoSync.GetBoolean();
+                if (_mareConfig.Current.EnableAutoDetectDiscovery != val)
+                {
+                    _mareConfig.Current.EnableAutoDetectDiscovery = val;
+                    changed = true;
+                }
+            }
+            if (root.TryGetProperty("AllowAutoSyncPairRequests", out var allowAutoSync))
+            {
+                var val = allowAutoSync.GetBoolean();
+                if (_mareConfig.Current.AllowAutoDetectPairRequests != val)
+                {
+                    _mareConfig.Current.AllowAutoDetectPairRequests = val;
+                    changed = true;
+                }
+            }
+            if (root.TryGetProperty("AutoSyncMaxDistanceMeters", out var maxDistSync) && maxDistSync.TryGetInt32(out var md))
+            {
+                if (_mareConfig.Current.AutoDetectMaxDistanceMeters != md)
+                {
+                    _mareConfig.Current.AutoDetectMaxDistanceMeters = md;
+                    changed = true;
+                }
+            }
+            if (root.TryGetProperty("AutoSyncMuteMinutes", out var muteSync) && muteSync.TryGetInt32(out var mm))
+            {
+                if (_mareConfig.Current.AutoDetectMuteMinutes != mm)
+                {
+                    _mareConfig.Current.AutoDetectMuteMinutes = mm;
+                    changed = true;
+                }
+            }
+
+            if (changed)
+            {
+                _logger.LogInformation("Migrated config: AutoSync -> AutoDetect fields");
+                _mareConfig.Save();
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Configuration migration failed");
+        }
     }
 
     public Task StartAsync(CancellationToken cancellationToken)

MareSynchronos/MareConfiguration/Configurations/CharaDataConfig.cs

@@ -12,8 +12,9 @@ public class CharaDataConfig : IMareConfiguration
     public bool NearbyOwnServerOnly { get; set; } = false;
     public bool NearbyIgnoreHousingLimitations { get; set; } = false;
     public bool NearbyDrawWisps { get; set; } = true;
+    public int NearbyMaxWisps { get; set; } = 20;
     public int NearbyDistanceFilter { get; set; } = 100;
     public bool NearbyShowOwnData { get; set; } = false;
     public bool ShowHelpTexts { get; set; } = true;
     public bool NearbyShowAlways { get; set; } = false;
-}
+}

MareSynchronos/MareConfiguration/Configurations/MareConfig.cs

@@ -1,4 +1,5 @@
-using MareSynchronos.MareConfiguration.Models;
+using System.Collections.Generic;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.UI;
 using Microsoft.Extensions.Logging;
 
@@ -19,7 +20,7 @@ public class MareConfig : IMareConfiguration
     public bool UseColorsInDtr { get; set; } = true;
     public DtrEntry.Colors DtrColorsDefault { get; set; } = default;
     public DtrEntry.Colors DtrColorsNotConnected { get; set; } = new(Glow: 0x0428FFu);
-    public DtrEntry.Colors DtrColorsPairsInRange { get; set; } = new(Glow: 0xFFBA47u);
+    public DtrEntry.Colors DtrColorsPairsInRange { get; set; } = new(Glow: 0x8D37C0u);
     public bool UseNameColors { get; set; } = false;
     public DtrEntry.Colors NameColors { get; set; } = new(Foreground: 0x67EBF5u, Glow: 0x00303Cu);
     public DtrEntry.Colors BlockedNameColors { get; set; } = new(Foreground: 0x8AADC7, Glow: 0x000080u);
@@ -37,6 +38,7 @@ public class MareConfig : IMareConfiguration
     public bool OpenGposeImportOnGposeStart { get; set; } = false;
     public bool OpenPopupOnAdd { get; set; } = true;
     public int ParallelDownloads { get; set; } = 10;
+    public bool EnableDownloadQueue { get; set; } = false;
     public int DownloadSpeedLimitInBytes { get; set; } = 0;
     public DownloadSpeeds DownloadSpeedType { get; set; } = DownloadSpeeds.MBps;
     [Obsolete] public bool PreferNotesOverNamesForVisible { get; set; } = false;
@@ -59,6 +61,16 @@ public class MareConfig : IMareConfiguration
     public bool ShowUploading { get; set; } = true;
     public bool ShowUploadingBigText { get; set; } = true;
     public bool ShowVisibleUsersSeparately { get; set; } = true;
+    public string LastChangelogVersionSeen { get; set; } = string.Empty;
+    public bool DefaultDisableSounds { get; set; } = false;
+    public bool DefaultDisableAnimations { get; set; } = false;
+    public bool DefaultDisableVfx { get; set; } = false;
+    public Dictionary<string, SyncOverrideEntry> PairSyncOverrides { get; set; } = new(StringComparer.Ordinal);
+    public Dictionary<string, SyncOverrideEntry> GroupSyncOverrides { get; set; } = new(StringComparer.Ordinal);
+    public bool EnableAutoDetectDiscovery { get; set; } = true;
+    public bool AllowAutoDetectPairRequests { get; set; } = true;
+    public int AutoDetectMaxDistanceMeters { get; set; } = 40;
+    public int AutoDetectMuteMinutes { get; set; } = 5;
     public int TimeSpanBetweenScansInSeconds { get; set; } = 30;
     public int TransferBarsHeight { get; set; } = 12;
     public bool TransferBarsShowText { get; set; } = true;
@@ -73,6 +85,9 @@ public class MareConfig : IMareConfiguration
     public int ChatLogKind { get; set; } = 1; // XivChatType.Debug
     public bool ExtraChatAPI { get; set; } = false;
     public bool ExtraChatTags { get; set; } = false;
+    public bool TypingIndicatorShowOnNameplates { get; set; } = true;
+    public bool TypingIndicatorShowOnPartyList { get; set; } = true;
+    public TypingIndicatorBubbleSize TypingIndicatorBubbleSize { get; set; } = TypingIndicatorBubbleSize.Large;
 
     public bool MareAPI { get; set; } = true;
-}
+}

MareSynchronos/MareConfiguration/Configurations/PlayerPerformanceConfig.cs

@@ -8,9 +8,10 @@ public class PlayerPerformanceConfig : IMareConfiguration
     public bool AutoPausePlayersExceedingThresholds { get; set; } = true;
     public bool NotifyAutoPauseDirectPairs { get; set; } = true;
     public bool NotifyAutoPauseGroupPairs { get; set; } = true;
+    public bool ShowSelfAnalysisWarnings { get; set; } = true;
     public int VRAMSizeAutoPauseThresholdMiB { get; set; } = 500;
     public int TrisAutoPauseThresholdThousands { get; set; } = 400;
     public bool IgnoreDirectPairs { get; set; } = true;
     public TextureShrinkMode TextureShrinkMode { get; set; } = TextureShrinkMode.Default;
     public bool TextureShrinkDeleteOriginal { get; set; } = false;
-}
+}

MareSynchronos/MareConfiguration/Models/SyncOverrideEntry.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace MareSynchronos.MareConfiguration.Models;
+
+[Serializable]
+public class SyncOverrideEntry
+{
+    public bool? DisableSounds { get; set; }
+    public bool? DisableAnimations { get; set; }
+    public bool? DisableVfx { get; set; }
+
+    public bool IsEmpty => DisableSounds is null && DisableAnimations is null && DisableVfx is null;
+}

MareSynchronos/MareConfiguration/Models/TypingIndicatorBubbleSize.cs

@@ -0,0 +1,8 @@
+namespace MareSynchronos.MareConfiguration.Models;
+
+public enum TypingIndicatorBubbleSize
+{
+    Small,
+    Medium,
+    Large
+}

MareSynchronos/MarePlugin.cs

@@ -5,6 +5,7 @@ using MareSynchronos.PlayerData.Services;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
+using MareSynchronos.Interop;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -150,8 +151,12 @@ public class MarePlugin : MediatorSubscriberBase, IHostedService
             _runtimeServiceScope.ServiceProvider.GetRequiredService<TransientResourceManager>();
             _runtimeServiceScope.ServiceProvider.GetRequiredService<OnlinePlayerManager>();
             _runtimeServiceScope.ServiceProvider.GetRequiredService<NotificationService>();
+            _runtimeServiceScope.ServiceProvider.GetRequiredService<SyncDefaultsService>();
             _runtimeServiceScope.ServiceProvider.GetRequiredService<ChatService>();
+            _runtimeServiceScope.ServiceProvider.GetRequiredService<ChatTypingDetectionService>();
             _runtimeServiceScope.ServiceProvider.GetRequiredService<GuiHookService>();
+            var characterAnalyzer = _runtimeServiceScope.ServiceProvider.GetRequiredService<CharacterAnalyzer>();
+            _ = characterAnalyzer.ComputeAnalysis(print: false);
 
 #if !DEBUG
             if (_mareConfigService.Current.LogLevel != LogLevel.Information)
@@ -167,4 +172,4 @@ public class MarePlugin : MediatorSubscriberBase, IHostedService
             Logger?.LogCritical(ex, "Error during launch of managers");
         }
     }
-}
+}

MareSynchronos/MareSynchronos.csproj

@@ -3,7 +3,7 @@
 <PropertyGroup>
   <AssemblyName>UmbraSync</AssemblyName>
   <RootNamespace>UmbraSync</RootNamespace>
-  <Version>0.0.3</Version>
+  <Version>0.1.9.6</Version>
 </PropertyGroup>
 
   <ItemGroup>
@@ -53,7 +53,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\UmbraAPI\MareSynchronosAPI\MareSynchronos.API.csproj" />
+    <ProjectReference Include="..\MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj" />
   </ItemGroup>
 
   <ItemGroup>

MareSynchronos/PlayerData/Factories/FileDownloadManagerFactory.cs

@@ -1,4 +1,5 @@
 using MareSynchronos.FileCache;
+using MareSynchronos.MareConfiguration;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.WebAPI.Files;
 using Microsoft.Extensions.Logging;
@@ -10,21 +11,23 @@ public class FileDownloadManagerFactory
     private readonly FileCacheManager _fileCacheManager;
     private readonly FileCompactor _fileCompactor;
     private readonly FileTransferOrchestrator _fileTransferOrchestrator;
+    private readonly MareConfigService _mareConfigService;
     private readonly ILoggerFactory _loggerFactory;
     private readonly MareMediator _mareMediator;
 
     public FileDownloadManagerFactory(ILoggerFactory loggerFactory, MareMediator mareMediator, FileTransferOrchestrator fileTransferOrchestrator,
-        FileCacheManager fileCacheManager, FileCompactor fileCompactor)
+        FileCacheManager fileCacheManager, FileCompactor fileCompactor, MareConfigService mareConfigService)
     {
         _loggerFactory = loggerFactory;
         _mareMediator = mareMediator;
         _fileTransferOrchestrator = fileTransferOrchestrator;
         _fileCacheManager = fileCacheManager;
         _fileCompactor = fileCompactor;
+        _mareConfigService = mareConfigService;
     }
 
     public FileDownloadManager Create()
     {
-        return new FileDownloadManager(_loggerFactory.CreateLogger<FileDownloadManager>(), _mareMediator, _fileTransferOrchestrator, _fileCacheManager, _fileCompactor);
+        return new FileDownloadManager(_loggerFactory.CreateLogger<FileDownloadManager>(), _mareMediator, _fileTransferOrchestrator, _fileCacheManager, _fileCompactor, _mareConfigService);
     }
-}
+}

MareSynchronos/PlayerData/Pairs/PairManager.cs

@@ -51,7 +51,7 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         RecreateLazy();
     }
 
-    public void AddGroupPair(GroupPairFullInfoDto dto)
+    public void AddGroupPair(GroupPairFullInfoDto dto, bool isInitialLoad = false)
     {
         if (!_allClientPairs.ContainsKey(dto.User))
             _allClientPairs[dto.User] = _pairFactory.Create(dto.User);
@@ -59,6 +59,11 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         var group = _allGroups[dto.Group];
         _allClientPairs[dto.User].GroupPair[group] = dto;
         RecreateLazy();
+
+        if (!isInitialLoad)
+        {
+            Mediator.Publish(new ApplyDefaultGroupPermissionsMessage(dto));
+        }
     }
 
     public Pair? GetPairByUID(string uid)
@@ -88,6 +93,11 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
             LastAddedUser = _allClientPairs[dto.User];
         _allClientPairs[dto.User].ApplyLastReceivedData();
         RecreateLazy();
+
+        if (addToLastAddedUser)
+        {
+            Mediator.Publish(new ApplyDefaultPairPermissionsMessage(dto));
+        }
     }
 
     public void ClearPairs()
@@ -210,9 +220,16 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
 
     public void SetGroupInfo(GroupInfoDto dto)
     {
-        _allGroups[dto.Group].Group = dto.Group;
-        _allGroups[dto.Group].Owner = dto.Owner;
-        _allGroups[dto.Group].GroupPermissions = dto.GroupPermissions;
+        if (!_allGroups.TryGetValue(dto.Group, out var groupInfo))
+        {
+            return;
+        }
+
+        groupInfo.Group = dto.Group;
+        groupInfo.Owner = dto.Owner;
+        groupInfo.GroupPermissions = dto.GroupPermissions;
+        groupInfo.IsTemporary = dto.IsTemporary;
+        groupInfo.ExpiresAt = dto.ExpiresAt;
 
         RecreateLazy();
     }
@@ -400,4 +417,4 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
         _directPairsInternal = DirectPairsLazy();
         _groupPairsInternal = GroupPairsLazy();
     }
-}
+}

MareSynchronos/Plugin.cs

@@ -39,8 +39,6 @@ public sealed class Plugin : IDalamudPlugin
     public static Plugin Self;
 #pragma warning restore CA2211, CS8618, MA0069, S1104, S2223
     public Action<IFramework>? RealOnFrameworkUpdate { get; set; }
-
-    // Proxy function in the UmbraSync namespace to avoid confusion in /xlstats
     public void OnFrameworkUpdate(IFramework framework)
     {
         RealOnFrameworkUpdate?.Invoke(framework);
@@ -98,6 +96,12 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton<HubFactory>();
             collection.AddSingleton<FileUploadManager>();
             collection.AddSingleton<FileTransferOrchestrator>();
+            collection.AddSingleton<MareSynchronos.Services.AutoDetect.DiscoveryConfigProvider>();
+            collection.AddSingleton<MareSynchronos.WebAPI.AutoDetect.DiscoveryApiClient>();
+            collection.AddSingleton<MareSynchronos.Services.AutoDetect.AutoDetectRequestService>();
+            collection.AddSingleton<MareSynchronos.Services.AutoDetect.NearbyDiscoveryService>();
+            collection.AddSingleton<MareSynchronos.Services.AutoDetect.NearbyPendingService>();
+            collection.AddSingleton<MareSynchronos.Services.AutoDetect.AutoDetectSuppressionService>();
             collection.AddSingleton<MarePlugin>();
             collection.AddSingleton<MareProfileManager>();
             collection.AddSingleton<GameObjectHandlerFactory>();
@@ -112,6 +116,7 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton<PluginWarningNotificationService>();
             collection.AddSingleton<FileCompactor>();
             collection.AddSingleton<TagHandler>();
+            collection.AddSingleton<SyncDefaultsService>();
             collection.AddSingleton<UidDisplayHandler>();
             collection.AddSingleton<PluginWatcherService>();
             collection.AddSingleton<PlayerPerformanceService>();
@@ -142,6 +147,10 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton<IpcCallerMare>();
             collection.AddSingleton<IpcManager>();
             collection.AddSingleton<NotificationService>();
+            collection.AddSingleton<TemporarySyncshellNotificationService>();
+            collection.AddSingleton<PartyListTypingService>();
+            collection.AddSingleton<TypingIndicatorStateService>();
+            collection.AddSingleton<ChatTwoCompatibilityService>();
 
             collection.AddSingleton((s) => new MareConfigService(pluginInterface.ConfigDirectory.FullName));
             collection.AddSingleton((s) => new ServerConfigService(pluginInterface.ConfigDirectory.FullName));
@@ -177,12 +186,15 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddScoped<WindowMediatorSubscriberBase, CompactUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, IntroUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, DownloadUi>();
+            collection.AddScoped<WindowMediatorSubscriberBase, AutoDetectUi>();
+            collection.AddScoped<WindowMediatorSubscriberBase, ChangelogUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, PopoutProfileUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, DataAnalysisUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, EventViewerUI>();
             collection.AddScoped<WindowMediatorSubscriberBase, CharaDataHubUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, EditProfileUi>();
             collection.AddScoped<WindowMediatorSubscriberBase, PopupHandler>();
+            collection.AddScoped<WindowMediatorSubscriberBase, TypingIndicatorOverlay>();
             collection.AddScoped<IPopupHandler, ReportPopupHandler>();
             collection.AddScoped<IPopupHandler, BanUserPopupHandler>();
             collection.AddScoped<CacheCreationService>();
@@ -194,11 +206,13 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddScoped<UiSharedService>();
             collection.AddScoped<ChatService>();
             collection.AddScoped<GuiHookService>();
+            collection.AddScoped<ChatTypingDetectionService>();
 
             collection.AddHostedService(p => p.GetRequiredService<PluginWatcherService>());
             collection.AddHostedService(p => p.GetRequiredService<ConfigurationSaveService>());
             collection.AddHostedService(p => p.GetRequiredService<MareMediator>());
             collection.AddHostedService(p => p.GetRequiredService<NotificationService>());
+            collection.AddHostedService(p => p.GetRequiredService<TemporarySyncshellNotificationService>());
             collection.AddHostedService(p => p.GetRequiredService<FileCacheManager>());
             collection.AddHostedService(p => p.GetRequiredService<ConfigurationMigrator>());
             collection.AddHostedService(p => p.GetRequiredService<DalamudUtilService>());
@@ -207,9 +221,22 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddHostedService(p => p.GetRequiredService<EventAggregator>());
             collection.AddHostedService(p => p.GetRequiredService<MarePlugin>());
             collection.AddHostedService(p => p.GetRequiredService<IpcProvider>());
+            collection.AddHostedService(p => p.GetRequiredService<MareSynchronos.Services.AutoDetect.NearbyDiscoveryService>());
+            collection.AddHostedService(p => p.GetRequiredService<ChatTwoCompatibilityService>());
+            collection.AddHostedService(p => p.GetRequiredService<MareSynchronos.Services.AutoDetect.AutoDetectSuppressionService>());
         })
         .Build();
 
+        try
+        {
+            var partyListTypingService = _host.Services.GetRequiredService<PartyListTypingService>();
+            pluginInterface.UiBuilder.Draw += partyListTypingService.Draw;
+        }
+        catch (Exception e)
+        {
+            pluginLog.Warning(e, "Failed to initialize PartyListTypingService draw hook");
+        }
+
         _ = Task.Run(async () => {
             try
             {
@@ -227,4 +254,4 @@ public sealed class Plugin : IDalamudPlugin
         _host.StopAsync().GetAwaiter().GetResult();
         _host.Dispose();
     }
-}
+}

MareSynchronos/Services/AutoDetect/AutoDetectRequestService.cs

@@ -0,0 +1,386 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.Extensions.Logging;
+using MareSynchronos.WebAPI.AutoDetect;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.Services;
+using MareSynchronos.Services.Mediator;
+using NotificationType = MareSynchronos.MareConfiguration.Models.NotificationType;
+using MareSynchronos.WebAPI;
+using MareSynchronos.API.Dto.User;
+using MareSynchronos.API.Data;
+
+namespace MareSynchronos.Services.AutoDetect;
+
+public class AutoDetectRequestService
+{
+    private readonly ILogger<AutoDetectRequestService> _logger;
+    private readonly DiscoveryConfigProvider _configProvider;
+    private readonly DiscoveryApiClient _client;
+    private readonly MareConfigService _configService;
+    private readonly DalamudUtilService _dalamud;
+    private readonly MareMediator _mediator;
+    private readonly object _syncRoot = new();
+    private readonly Dictionary<string, DateTime> _activeCooldowns = new(StringComparer.Ordinal);
+    private readonly Dictionary<string, RefusalTracker> _refusalTrackers = new(StringComparer.Ordinal);
+    private readonly ConcurrentDictionary<string, PendingRequestInfo> _pendingRequests = new(StringComparer.Ordinal);
+    private static readonly TimeSpan RequestCooldown = TimeSpan.FromMinutes(5);
+    private static readonly TimeSpan RefusalLockDuration = TimeSpan.FromMinutes(15);
+    private readonly ApiController _apiController;
+
+    public AutoDetectRequestService(ILogger<AutoDetectRequestService> logger, DiscoveryConfigProvider configProvider, DiscoveryApiClient client, MareConfigService configService, MareMediator mediator, DalamudUtilService dalamudUtilService, ApiController apiController)
+    {
+        _logger = logger;
+        _configProvider = configProvider;
+        _client = client;
+        _configService = configService;
+        _mediator = mediator;
+        _dalamud = dalamudUtilService;
+        _apiController = apiController;
+    }
+
+    public async Task<bool> SendRequestAsync(string? token, string? uid = null, string? targetDisplayName = null, CancellationToken ct = default)
+    {
+        if (!_configService.Current.AllowAutoDetectPairRequests)
+        {
+            _logger.LogDebug("Nearby request blocked: AllowAutoDetectPairRequests is disabled");
+            _mediator.Publish(new NotificationMessage("Nearby request blocked", "Enable 'Allow pair requests' in Settings to send requests.", NotificationType.Info));
+            return false;
+        }
+
+        if (string.IsNullOrEmpty(token) && string.IsNullOrEmpty(uid))
+        {
+            _logger.LogDebug("Nearby request blocked: no token or UID provided");
+            return false;
+        }
+
+        var targetKey = BuildTargetKey(uid, token, targetDisplayName);
+        if (!string.IsNullOrEmpty(targetKey))
+        {
+            var now = DateTime.UtcNow;
+            lock (_syncRoot)
+            {
+                if (_refusalTrackers.TryGetValue(targetKey, out var tracker))
+                {
+                    if (tracker.LockUntil.HasValue && tracker.LockUntil.Value > now)
+                    {
+                        PublishLockNotification(tracker.LockUntil.Value - now);
+                        return false;
+                    }
+
+                    if (tracker.LockUntil.HasValue && tracker.LockUntil.Value <= now)
+                    {
+                        tracker.LockUntil = null;
+                        tracker.Count = 0;
+                        if (tracker.Count == 0 && tracker.LockUntil == null)
+                        {
+                            _refusalTrackers.Remove(targetKey);
+                        }
+                    }
+                }
+
+                if (_activeCooldowns.TryGetValue(targetKey, out var lastSent))
+                {
+                    var elapsed = now - lastSent;
+                    if (elapsed < RequestCooldown)
+                    {
+                        PublishCooldownNotification(RequestCooldown - elapsed);
+                        return false;
+                    }
+
+                    if (elapsed >= RequestCooldown)
+                    {
+                        _activeCooldowns.Remove(targetKey);
+                    }
+                }
+            }
+        }
+        var endpoint = _configProvider.RequestEndpoint;
+        if (string.IsNullOrEmpty(endpoint))
+        {
+            _logger.LogDebug("No request endpoint configured");
+            _mediator.Publish(new NotificationMessage("Nearby request failed", "Server does not expose request endpoint.", NotificationType.Error));
+            return false;
+        }
+        string? displayName = null;
+        try
+        {
+            var me = await _dalamud.RunOnFrameworkThread(() => _dalamud.GetPlayerCharacter()).ConfigureAwait(false);
+            displayName = me?.Name.TextValue;
+        }
+        catch { }
+
+        var requestToken = string.IsNullOrEmpty(token) ? null : token;
+        var requestUid = requestToken == null ? uid : null;
+
+        _logger.LogInformation("Nearby: sending pair request via {endpoint}", endpoint);
+        var ok = await _client.SendRequestAsync(endpoint!, requestToken, requestUid, displayName, ct).ConfigureAwait(false);
+        if (ok)
+        {
+            if (!string.IsNullOrEmpty(targetKey))
+            {
+                lock (_syncRoot)
+                {
+                    _activeCooldowns[targetKey] = DateTime.UtcNow;
+                    if (_refusalTrackers.TryGetValue(targetKey, out var tracker))
+                    {
+                        tracker.Count = 0;
+                        tracker.LockUntil = null;
+                        if (tracker.Count == 0 && tracker.LockUntil == null)
+                        {
+                            _refusalTrackers.Remove(targetKey);
+                        }
+                    }
+                }
+            }
+            _mediator.Publish(new NotificationMessage("Nearby request sent", "The other user will receive a request notification.", NotificationType.Info));
+            var pendingKey = EnsureTargetKey(targetKey);
+            var label = !string.IsNullOrWhiteSpace(targetDisplayName)
+                ? targetDisplayName!
+                : (!string.IsNullOrEmpty(uid) ? uid : (!string.IsNullOrEmpty(token) ? token : pendingKey));
+            _pendingRequests[pendingKey] = new PendingRequestInfo(pendingKey, uid, token, label, DateTime.UtcNow);
+        }
+        else
+        {
+            if (!string.IsNullOrEmpty(targetKey))
+            {
+                var now = DateTime.UtcNow;
+                lock (_syncRoot)
+                {
+                    _activeCooldowns.Remove(targetKey);
+                    if (!_refusalTrackers.TryGetValue(targetKey, out var tracker))
+                    {
+                        tracker = new RefusalTracker();
+                        _refusalTrackers[targetKey] = tracker;
+                    }
+
+                    if (tracker.LockUntil.HasValue && tracker.LockUntil.Value <= now)
+                    {
+                        tracker.LockUntil = null;
+                        tracker.Count = 0;
+                    }
+
+                    tracker.Count++;
+                    if (tracker.Count >= 3)
+                    {
+                        tracker.LockUntil = now.Add(RefusalLockDuration);
+                    }
+                }
+                _pendingRequests.TryRemove(targetKey, out _);
+            }
+            _mediator.Publish(new NotificationMessage("Nearby request failed", "The server rejected the request. Try again soon.", NotificationType.Warning));
+        }
+        return ok;
+    }
+
+    public async Task<bool> SendAcceptNotifyAsync(string targetUid, CancellationToken ct = default)
+    {
+        var endpoint = _configProvider.AcceptEndpoint;
+        if (string.IsNullOrEmpty(endpoint))
+        {
+            _logger.LogDebug("No accept endpoint configured");
+            return false;
+        }
+        string? displayName = null;
+        try
+        {
+            var me = await _dalamud.RunOnFrameworkThread(() => _dalamud.GetPlayerCharacter()).ConfigureAwait(false);
+            displayName = me?.Name.TextValue;
+        }
+        catch { }
+        _logger.LogInformation("Nearby: sending accept notify via {endpoint}", endpoint);
+        return await _client.SendAcceptAsync(endpoint!, targetUid, displayName, ct).ConfigureAwait(false);
+    }
+
+    public async Task<bool> SendDirectUidRequestAsync(string uid, string? targetDisplayName = null, CancellationToken ct = default)
+    {
+        if (!_configService.Current.AllowAutoDetectPairRequests)
+        {
+            _logger.LogDebug("Nearby request blocked: AllowAutoDetectPairRequests is disabled");
+            _mediator.Publish(new NotificationMessage("Nearby request blocked", "Enable 'Allow pair requests' in Settings to send requests.", NotificationType.Info));
+            return false;
+        }
+
+        if (string.IsNullOrEmpty(uid))
+        {
+            _logger.LogDebug("Direct pair request aborted: UID is empty");
+            return false;
+        }
+
+        var targetKey = BuildTargetKey(uid, null, targetDisplayName);
+        if (!string.IsNullOrEmpty(targetKey))
+        {
+            var now = DateTime.UtcNow;
+            lock (_syncRoot)
+            {
+                if (_refusalTrackers.TryGetValue(targetKey, out var tracker))
+                {
+                    if (tracker.LockUntil.HasValue && tracker.LockUntil.Value > now)
+                    {
+                        PublishLockNotification(tracker.LockUntil.Value - now);
+                        return false;
+                    }
+
+                    if (tracker.LockUntil.HasValue && tracker.LockUntil.Value <= now)
+                    {
+                        tracker.LockUntil = null;
+                        tracker.Count = 0;
+                        if (tracker.Count == 0 && tracker.LockUntil == null)
+                        {
+                            _refusalTrackers.Remove(targetKey);
+                        }
+                    }
+                }
+
+                if (_activeCooldowns.TryGetValue(targetKey, out var lastSent))
+                {
+                    var elapsed = now - lastSent;
+                    if (elapsed < RequestCooldown)
+                    {
+                        PublishCooldownNotification(RequestCooldown - elapsed);
+                        return false;
+                    }
+
+                    if (elapsed >= RequestCooldown)
+                    {
+                        _activeCooldowns.Remove(targetKey);
+                    }
+                }
+            }
+        }
+
+        try
+        {
+            await _apiController.UserAddPair(new UserDto(new UserData(uid))).ConfigureAwait(false);
+
+            if (!string.IsNullOrEmpty(targetKey))
+            {
+                lock (_syncRoot)
+                {
+                    _activeCooldowns[targetKey] = DateTime.UtcNow;
+                    if (_refusalTrackers.TryGetValue(targetKey, out var tracker))
+                    {
+                        tracker.Count = 0;
+                        tracker.LockUntil = null;
+                        if (tracker.Count == 0 && tracker.LockUntil == null)
+                        {
+                            _refusalTrackers.Remove(targetKey);
+                        }
+                    }
+                }
+            }
+
+            _mediator.Publish(new NotificationMessage("Nearby request sent", "The other user will receive a request notification.", NotificationType.Info));
+            var pendingKey = EnsureTargetKey(targetKey);
+            var label = !string.IsNullOrWhiteSpace(targetDisplayName) ? targetDisplayName! : uid;
+            _pendingRequests[pendingKey] = new PendingRequestInfo(pendingKey, uid, null, label, DateTime.UtcNow);
+
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Direct pair request failed for {uid}", uid);
+            if (!string.IsNullOrEmpty(targetKey))
+            {
+                var now = DateTime.UtcNow;
+                lock (_syncRoot)
+                {
+                    _activeCooldowns.Remove(targetKey);
+                    if (!_refusalTrackers.TryGetValue(targetKey, out var tracker))
+                    {
+                        tracker = new RefusalTracker();
+                        _refusalTrackers[targetKey] = tracker;
+                    }
+
+                    if (tracker.LockUntil.HasValue && tracker.LockUntil.Value <= now)
+                    {
+                        tracker.LockUntil = null;
+                        tracker.Count = 0;
+                    }
+
+                    tracker.Count++;
+                    if (tracker.Count >= 3)
+                    {
+                        tracker.LockUntil = now.Add(RefusalLockDuration);
+                    }
+                }
+                _pendingRequests.TryRemove(targetKey, out _);
+            }
+
+            _mediator.Publish(new NotificationMessage("Nearby request failed", "The server rejected the request. Try again soon.", NotificationType.Warning));
+            return false;
+        }
+    }
+
+    private static string? BuildTargetKey(string? uid, string? token, string? displayName)
+    {
+        if (!string.IsNullOrEmpty(uid)) return "uid:" + uid;
+        if (!string.IsNullOrEmpty(token)) return "token:" + token;
+        if (!string.IsNullOrEmpty(displayName)) return "name:" + displayName;
+        return null;
+    }
+
+    private void PublishCooldownNotification(TimeSpan remaining)
+    {
+        var durationText = FormatDuration(remaining);
+        _mediator.Publish(new NotificationMessage("Nearby request en attente", $"Nearby request déjà envoyée. Merci d'attendre environ {durationText} avant de réessayer.", NotificationType.Info, TimeSpan.FromSeconds(5)));
+    }
+
+    private void PublishLockNotification(TimeSpan remaining)
+    {
+        var durationText = FormatDuration(remaining);
+        _mediator.Publish(new NotificationMessage("Nearby request bloquée", $"Nearby request bloquée après plusieurs refus. Réessayez dans {durationText}.", NotificationType.Warning, TimeSpan.FromSeconds(5)));
+    }
+
+    private static string FormatDuration(TimeSpan remaining)
+    {
+        if (remaining.TotalMinutes >= 1)
+        {
+            var minutes = Math.Max(1, (int)Math.Ceiling(remaining.TotalMinutes));
+            return minutes == 1 ? "1 minute" : minutes + " minutes";
+        }
+
+        var seconds = Math.Max(1, (int)Math.Ceiling(remaining.TotalSeconds));
+        return seconds == 1 ? "1 seconde" : seconds + " secondes";
+    }
+
+    private sealed class RefusalTracker
+    {
+        public int Count;
+        public DateTime? LockUntil;
+    }
+
+    public IReadOnlyCollection<PendingRequestInfo> GetPendingRequestsSnapshot()
+    {
+        return _pendingRequests.Values.OrderByDescending(v => v.SentAt).ToList();
+    }
+
+    public void RemovePendingRequestByUid(string uid)
+    {
+        if (string.IsNullOrEmpty(uid)) return;
+        foreach (var kvp in _pendingRequests)
+        {
+            if (string.Equals(kvp.Value.Uid, uid, StringComparison.Ordinal))
+            {
+                _pendingRequests.TryRemove(kvp.Key, out _);
+                break;
+            }
+        }
+    }
+
+    public void RemovePendingRequestByKey(string key)
+    {
+        if (string.IsNullOrEmpty(key)) return;
+        _pendingRequests.TryRemove(key, out _);
+    }
+
+    private static string EnsureTargetKey(string? targetKey)
+    {
+        return !string.IsNullOrEmpty(targetKey) ? targetKey! : "target:" + Guid.NewGuid().ToString("N");
+    }
+
+    public sealed record PendingRequestInfo(string Key, string? Uid, string? Token, string TargetDisplayName, DateTime SentAt);
+}

MareSynchronos/Services/AutoDetect/AutoDetectSuppressionService.cs

@@ -0,0 +1,209 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Dalamud.Plugin.Services;
+using Lumina.Excel.Sheets;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.MareConfiguration.Models;
+using MareSynchronos.Services;
+using MareSynchronos.Services.Mediator;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace MareSynchronos.Services.AutoDetect;
+
+public sealed class AutoDetectSuppressionService : IHostedService, IMediatorSubscriber
+{
+    private static readonly string[] ContentTypeKeywords =
+    [
+        "dungeon",
+        "donjon",
+        "raid",
+        "trial",
+        "défi",
+        "front",
+        "frontline",
+        "pvp",
+        "jcj",
+        "conflict",
+        "conflit"
+    ];
+
+    private readonly ILogger<AutoDetectSuppressionService> _logger;
+    private readonly MareConfigService _configService;
+    private readonly IClientState _clientState;
+    private readonly IDataManager _dataManager;
+    private readonly MareMediator _mediator;
+    private readonly DalamudUtilService _dalamudUtilService;
+
+    private bool _isSuppressed;
+    private bool _hasSavedState;
+    private bool _savedDiscoveryEnabled;
+    private bool _savedAllowRequests;
+    private bool _suppressionWarningShown;
+    public bool IsSuppressed => _isSuppressed;
+
+    public AutoDetectSuppressionService(ILogger<AutoDetectSuppressionService> logger,
+        MareConfigService configService, IClientState clientState,
+        IDataManager dataManager, DalamudUtilService dalamudUtilService, MareMediator mediator)
+    {
+        _logger = logger;
+        _configService = configService;
+        _clientState = clientState;
+        _dataManager = dataManager;
+        _dalamudUtilService = dalamudUtilService;
+        _mediator = mediator;
+    }
+
+    public MareMediator Mediator => _mediator;
+
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        _mediator.Subscribe<ZoneSwitchEndMessage>(this, _ => UpdateSuppressionState());
+        _mediator.Subscribe<DalamudLoginMessage>(this, _ => UpdateSuppressionState());
+        _mediator.Subscribe<DalamudLogoutMessage>(this, _ => ClearSuppression());
+        UpdateSuppressionState();
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        _mediator.UnsubscribeAll(this);
+        return Task.CompletedTask;
+    }
+
+    private void UpdateSuppressionState()
+    {
+        _ = _dalamudUtilService.RunOnFrameworkThread(() =>
+        {
+            try
+            {
+                if (!_clientState.IsLoggedIn || _clientState.LocalPlayer == null)
+                {
+                    ClearSuppression();
+                    return;
+                }
+
+                uint territoryId = _clientState.TerritoryType;
+                bool shouldSuppress = ShouldSuppressForTerritory(territoryId);
+                ApplySuppression(shouldSuppress, territoryId);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Failed to update AutoDetect suppression state");
+            }
+        });
+    }
+
+    private void ApplySuppression(bool shouldSuppress, uint territoryId)
+    {
+        if (shouldSuppress)
+        {
+            if (!_isSuppressed)
+            {
+                _savedDiscoveryEnabled = _configService.Current.EnableAutoDetectDiscovery;
+                _savedAllowRequests = _configService.Current.AllowAutoDetectPairRequests;
+                _hasSavedState = true;
+                _isSuppressed = true;
+            }
+
+            bool changed = false;
+            if (_configService.Current.EnableAutoDetectDiscovery)
+            {
+                _configService.Current.EnableAutoDetectDiscovery = false;
+                changed = true;
+            }
+            if (_configService.Current.AllowAutoDetectPairRequests)
+            {
+                _configService.Current.AllowAutoDetectPairRequests = false;
+                changed = true;
+            }
+
+            if (changed)
+            {
+                _logger.LogInformation("AutoDetect temporarily disabled in instanced content (territory {territoryId}).", territoryId);
+                if (!_suppressionWarningShown)
+                {
+                    _suppressionWarningShown = true;
+                    const string warningText = "Zone instanciée détectée : les fonctions AutoDetect/Nearby sont coupées pour économiser de la bande passante.";
+                    _mediator.Publish(new DualNotificationMessage("AutoDetect désactivé",
+                        warningText,
+                        NotificationType.Warning, TimeSpan.FromSeconds(5)));
+                }
+            }
+
+            return;
+        }
+        else
+        {
+            if (!_isSuppressed) return;
+
+            bool changed = false;
+            bool wasSuppressed = _suppressionWarningShown;
+            if (_hasSavedState)
+            {
+                if (_configService.Current.EnableAutoDetectDiscovery != _savedDiscoveryEnabled)
+                {
+                    _configService.Current.EnableAutoDetectDiscovery = _savedDiscoveryEnabled;
+                    changed = true;
+                }
+                if (_configService.Current.AllowAutoDetectPairRequests != _savedAllowRequests)
+                {
+                    _configService.Current.AllowAutoDetectPairRequests = _savedAllowRequests;
+                    changed = true;
+                }
+            }
+
+            _isSuppressed = false;
+            _hasSavedState = false;
+            _suppressionWarningShown = false;
+
+            if (changed || wasSuppressed)
+            {
+                _logger.LogInformation("AutoDetect restored after leaving instanced content (territory {territoryId}).", territoryId);
+                const string restoredText = "Vous avez quitté la zone instanciée : AutoDetect/Nearby fonctionnent de nouveau.";
+                _mediator.Publish(new DualNotificationMessage("AutoDetect réactivé",
+                    restoredText,
+                    NotificationType.Info, TimeSpan.FromSeconds(5)));
+            }
+        }
+    }
+
+    private void ClearSuppression()
+    {
+        if (!_isSuppressed) return;
+        _isSuppressed = false;
+        if (_hasSavedState)
+        {
+            _configService.Current.EnableAutoDetectDiscovery = _savedDiscoveryEnabled;
+            _configService.Current.AllowAutoDetectPairRequests = _savedAllowRequests;
+        }
+        _hasSavedState = false;
+        _suppressionWarningShown = false;
+    }
+
+    private bool ShouldSuppressForTerritory(uint territoryId)
+    {
+        if (territoryId == 0) return false;
+
+        var cfcSheet = _dataManager.GetExcelSheet<ContentFinderCondition>();
+        if (cfcSheet == null) return false;
+
+        var cfc = cfcSheet.FirstOrDefault(c => c.TerritoryType.RowId == territoryId);
+        if (cfc.RowId == 0) return false;
+
+        if (MatchesSuppressionKeyword(cfc.Name.ToString())) return true;
+
+        var contentType = cfc.ContentType.Value;
+        if (contentType.RowId == 0) return false;
+
+        return MatchesSuppressionKeyword(contentType.Name.ToString());
+    }
+
+    private static bool MatchesSuppressionKeyword(string? text)
+    {
+        if (string.IsNullOrWhiteSpace(text)) return false;
+        return ContentTypeKeywords.Any(keyword => text.Contains(keyword, StringComparison.OrdinalIgnoreCase));
+    }
+}

MareSynchronos/Services/AutoDetect/DiscoveryConfigProvider.cs

@@ -0,0 +1,173 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.Extensions.Logging;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.Services.ServerConfiguration;
+using MareSynchronos.WebAPI.SignalR;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
+
+namespace MareSynchronos.Services.AutoDetect;
+
+public class DiscoveryConfigProvider
+{
+    private readonly ILogger<DiscoveryConfigProvider> _logger;
+    private readonly ServerConfigurationManager _serverManager;
+    private readonly TokenProvider _tokenProvider;
+
+    private WellKnownRoot? _config;
+    private DateTimeOffset _lastLoad = DateTimeOffset.MinValue;
+
+    public DiscoveryConfigProvider(ILogger<DiscoveryConfigProvider> logger, ServerConfigurationManager serverManager, TokenProvider tokenProvider)
+    {
+        _logger = logger;
+        _serverManager = serverManager;
+        _tokenProvider = tokenProvider;
+    }
+
+    public bool HasConfig => _config != null;
+    public bool NearbyEnabled => _config?.NearbyDiscovery?.Enabled ?? false;
+    public byte[]? Salt => _config?.NearbyDiscovery?.SaltBytes;
+    public string? SaltB64 => _config?.NearbyDiscovery?.SaltB64;
+    public DateTimeOffset? SaltExpiresAt => _config?.NearbyDiscovery?.SaltExpiresAt;
+    public int RefreshSec => _config?.NearbyDiscovery?.RefreshSec ?? 300;
+    public int MinQueryIntervalMs => _config?.NearbyDiscovery?.Policies?.MinQueryIntervalMs ?? 2000;
+    public int MaxQueryBatch => _config?.NearbyDiscovery?.Policies?.MaxQueryBatch ?? 100;
+    public string? PublishEndpoint => _config?.NearbyDiscovery?.Endpoints?.Publish;
+    public string? QueryEndpoint => _config?.NearbyDiscovery?.Endpoints?.Query;
+    public string? RequestEndpoint => _config?.NearbyDiscovery?.Endpoints?.Request;
+    public string? AcceptEndpoint => _config?.NearbyDiscovery?.Endpoints?.Accept;
+
+    public bool TryLoadFromStapled()
+    {
+        try
+        {
+            var json = _tokenProvider.GetStapledWellKnown(_serverManager.CurrentApiUrl);
+            if (string.IsNullOrEmpty(json)) return false;
+
+            var root = JsonSerializer.Deserialize<WellKnownRoot>(json!);
+            if (root == null) return false;
+
+            root.NearbyDiscovery?.Hydrate();
+            _config = root;
+            _lastLoad = DateTimeOffset.UtcNow;
+            _logger.LogDebug("Loaded Nearby well-known (stapled), enabled={enabled}, expires={exp}", NearbyEnabled, _config?.NearbyDiscovery?.SaltExpiresAt);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Failed to parse stapled well-known");
+            return false;
+        }
+    }
+
+    public async Task<bool> TryFetchFromServerAsync(CancellationToken ct = default)
+    {
+        try
+        {
+            var baseUrl = _serverManager.CurrentApiUrl
+                .Replace("wss://", "https://", StringComparison.OrdinalIgnoreCase)
+                .Replace("ws://", "http://", StringComparison.OrdinalIgnoreCase);
+            // Try likely candidates based on nginx config
+            string[] candidates =
+            [
+                "/.well-known/Umbra/client", // matches provided nginx
+                "/.well-known/umbra",        // lowercase variant
+            ];
+
+            using var http = new HttpClient();
+            try
+            {
+                var ver = Assembly.GetExecutingAssembly().GetName().Version!;
+                http.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("MareSynchronos", $"{ver.Major}.{ver.Minor}.{ver.Build}"));
+            }
+            catch { }
+
+            foreach (var path in candidates)
+            {
+                try
+                {
+                    var uri = new Uri(new Uri(baseUrl), path);
+                    var json = await http.GetStringAsync(uri, ct).ConfigureAwait(false);
+                    if (string.IsNullOrEmpty(json)) continue;
+
+                    var root = JsonSerializer.Deserialize<WellKnownRoot>(json);
+                    if (root == null) continue;
+
+                    root.NearbyDiscovery?.Hydrate();
+                    _config = root;
+                    _lastLoad = DateTimeOffset.UtcNow;
+                    _logger.LogInformation("Loaded Nearby well-known (http {path}), enabled={enabled}", path, NearbyEnabled);
+                    return true;
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogDebug(ex, "Nearby well-known fetch failed for {path}", path);
+                }
+            }
+
+            _logger.LogInformation("Nearby well-known not found via HTTP candidates");
+            return false;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Failed to fetch Nearby well-known via HTTP");
+            return false;
+        }
+    }
+
+    public bool IsExpired()
+    {
+        if (_config?.NearbyDiscovery?.SaltExpiresAt == null) return false;
+        return DateTimeOffset.UtcNow > _config.NearbyDiscovery.SaltExpiresAt;
+    }
+
+    // DTOs for well-known JSON
+    private sealed class WellKnownRoot
+    {
+        [JsonPropertyName("features")] public Features? Features { get; set; }
+        [JsonPropertyName("nearby_discovery")] public Nearby? NearbyDiscovery { get; set; }
+    }
+
+    private sealed class Features
+    {
+        [JsonPropertyName("nearby_discovery")] public bool NearbyDiscovery { get; set; }
+    }
+
+    private sealed class Nearby
+    {
+        [JsonPropertyName("enabled")] public bool Enabled { get; set; }
+        [JsonPropertyName("hash_algo")] public string? HashAlgo { get; set; }
+        [JsonPropertyName("salt_b64")] public string? SaltB64 { get; set; }
+        [JsonPropertyName("salt_expires_at")] public string? SaltExpiresAtRaw { get; set; }
+        [JsonPropertyName("refresh_sec")] public int RefreshSec { get; set; } = 300;
+        [JsonPropertyName("endpoints")] public Endpoints? Endpoints { get; set; }
+        [JsonPropertyName("policies")] public Policies? Policies { get; set; }
+
+        [JsonIgnore] public byte[]? SaltBytes { get; private set; }
+        [JsonIgnore] public DateTimeOffset? SaltExpiresAt { get; private set; }
+
+        public void Hydrate()
+        {
+            try { SaltBytes = string.IsNullOrEmpty(SaltB64) ? null : Convert.FromBase64String(SaltB64!); } catch { SaltBytes = null; }
+            if (DateTimeOffset.TryParse(SaltExpiresAtRaw, out var dto)) SaltExpiresAt = dto;
+        }
+    }
+
+    private sealed class Endpoints
+    {
+        [JsonPropertyName("publish")] public string? Publish { get; set; }
+        [JsonPropertyName("query")] public string? Query { get; set; }
+        [JsonPropertyName("request")] public string? Request { get; set; }
+        [JsonPropertyName("accept")] public string? Accept { get; set; }
+    }
+
+    private sealed class Policies
+    {
+        [JsonPropertyName("max_query_batch")] public int MaxQueryBatch { get; set; } = 100;
+        [JsonPropertyName("min_query_interval_ms")] public int MinQueryIntervalMs { get; set; } = 2000;
+        [JsonPropertyName("rate_limit_per_min")] public int RateLimitPerMin { get; set; } = 30;
+        [JsonPropertyName("token_ttl_sec")] public int TokenTtlSec { get; set; } = 120;
+    }
+}

MareSynchronos/Services/AutoDetect/NearbyDiscoveryService.cs

@@ -0,0 +1,477 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Hosting;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.Services.ServerConfiguration;
+using MareSynchronos.WebAPI.AutoDetect;
+using Dalamud.Plugin.Services;
+using System.Numerics;
+using System.Linq;
+using MareSynchronos.Utils;
+
+namespace MareSynchronos.Services.AutoDetect;
+
+public class NearbyDiscoveryService : IHostedService, IMediatorSubscriber
+{
+    private readonly ILogger<NearbyDiscoveryService> _logger;
+    private readonly MareMediator _mediator;
+    private readonly MareConfigService _config;
+    private readonly DiscoveryConfigProvider _configProvider;
+    private readonly DalamudUtilService _dalamud;
+    private readonly IObjectTable _objectTable;
+    private readonly DiscoveryApiClient _api;
+    private CancellationTokenSource? _loopCts;
+    private string? _lastPublishedSignature;
+    private bool _loggedLocalOnly;
+    private int _lastLocalCount = -1;
+    private int _lastMatchCount = -1;
+    private bool _loggedConfigReady;
+    private string? _lastSnapshotSig;
+    private volatile bool _isConnected;
+    private bool _notifiedDisabled;
+    private bool _notifiedEnabled;
+    private bool _disableSent;
+    private bool _lastAutoDetectState;
+    private DateTime _lastHeartbeat = DateTime.MinValue;
+    private static readonly TimeSpan HeartbeatInterval = TimeSpan.FromSeconds(75);
+
+    public NearbyDiscoveryService(ILogger<NearbyDiscoveryService> logger, MareMediator mediator,
+        MareConfigService config, DiscoveryConfigProvider configProvider, DalamudUtilService dalamudUtilService,
+        IObjectTable objectTable, DiscoveryApiClient api)
+    {
+        _logger = logger;
+        _mediator = mediator;
+        _config = config;
+        _configProvider = configProvider;
+        _dalamud = dalamudUtilService;
+        _objectTable = objectTable;
+        _api = api;
+    }
+
+    public MareMediator Mediator => _mediator;
+
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        _loopCts = new CancellationTokenSource();
+        _mediator.Subscribe<ConnectedMessage>(this, _ => { _isConnected = true; _configProvider.TryLoadFromStapled(); });
+        _mediator.Subscribe<DisconnectedMessage>(this, _ => { _isConnected = false; _lastPublishedSignature = null; });
+        _mediator.Subscribe<AllowPairRequestsToggled>(this, OnAllowPairRequestsToggled);
+        _ = Task.Run(() => Loop(_loopCts.Token));
+        _lastAutoDetectState = _config.Current.EnableAutoDetectDiscovery;
+        return Task.CompletedTask;
+    }
+    private async void OnAllowPairRequestsToggled(AllowPairRequestsToggled msg)
+    {
+        try
+        {
+            if (!_config.Current.EnableAutoDetectDiscovery) return;
+            // Force a publish now so the server immediately reflects the new allow/deny state
+            _lastPublishedSignature = null; // ensure next loop won't skip
+            await PublishSelfOnceAsync(CancellationToken.None).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "OnAllowPairRequestsToggled failed");
+        }
+    }
+
+    private async Task PublishSelfOnceAsync(CancellationToken ct)
+    {
+        try
+        {
+            if (!_config.Current.EnableAutoDetectDiscovery || !_dalamud.IsLoggedIn || !_isConnected) return;
+
+            if (!_configProvider.HasConfig || _configProvider.IsExpired())
+            {
+                if (!_configProvider.TryLoadFromStapled())
+                {
+                    await _configProvider.TryFetchFromServerAsync(ct).ConfigureAwait(false);
+                }
+            }
+
+            var ep = _configProvider.PublishEndpoint;
+            var saltBytes = _configProvider.Salt;
+            if (string.IsNullOrEmpty(ep) || saltBytes is not { Length: > 0 }) return;
+
+            var saltHex = Convert.ToHexString(saltBytes);
+            string? displayName = null;
+            ushort meWorld = 0;
+            try
+            {
+                var me = await _dalamud.RunOnFrameworkThread(() => _dalamud.GetPlayerCharacter()).ConfigureAwait(false);
+                if (me != null)
+                {
+                    displayName = me.Name.TextValue;
+                    if (me is Dalamud.Game.ClientState.Objects.SubKinds.IPlayerCharacter mePc)
+                        meWorld = (ushort)mePc.HomeWorld.RowId;
+                }
+            }
+            catch { }
+
+            if (string.IsNullOrEmpty(displayName)) return;
+
+            var selfHash = (saltHex + displayName + meWorld.ToString()).GetHash256();
+            var ok = await _api.PublishAsync(ep!, new[] { selfHash }, displayName, ct, _config.Current.AllowAutoDetectPairRequests).ConfigureAwait(false);
+            _logger.LogInformation("Nearby publish (manual/immediate): {result}", ok ? "success" : "failed");
+            if (ok)
+            {
+                _lastPublishedSignature = selfHash;
+                _lastHeartbeat = DateTime.UtcNow;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "Immediate publish failed");
+        }
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        _mediator.UnsubscribeAll(this);
+        try { _loopCts?.Cancel(); } catch { }
+        return Task.CompletedTask;
+    }
+
+    private async Task Loop(CancellationToken ct)
+    {
+        _configProvider.TryLoadFromStapled();
+
+        while (!ct.IsCancellationRequested)
+        {
+            try
+            {
+                bool currentState = _config.Current.EnableAutoDetectDiscovery;
+                if (currentState != _lastAutoDetectState)
+                {
+                    _lastAutoDetectState = currentState;
+                    if (currentState)
+                    {
+                        // Force immediate publish on toggle ON
+                        try
+                        {
+                            // Ensure well-known is present
+                            if (!_configProvider.HasConfig || _configProvider.IsExpired())
+                            {
+                                if (!_configProvider.TryLoadFromStapled())
+                                {
+                                    await _configProvider.TryFetchFromServerAsync(ct).ConfigureAwait(false);
+                                }
+                            }
+
+                            var ep = _configProvider.PublishEndpoint;
+                            var saltBytes = _configProvider.Salt;
+                            if (!string.IsNullOrEmpty(ep) && saltBytes is { Length: > 0 })
+                            {
+                                var saltHex = Convert.ToHexString(saltBytes);
+                                string? displayName = null;
+                                ushort meWorld = 0;
+                                try
+                                {
+                                    var me = await _dalamud.RunOnFrameworkThread(() => _dalamud.GetPlayerCharacter()).ConfigureAwait(false);
+                                    if (me != null)
+                                    {
+                                        displayName = me.Name.TextValue;
+                                        if (me is Dalamud.Game.ClientState.Objects.SubKinds.IPlayerCharacter mePc)
+                                            meWorld = (ushort)mePc.HomeWorld.RowId;
+                                    }
+                                }
+                                catch { }
+
+                                if (!string.IsNullOrEmpty(displayName))
+                                {
+                                var selfHash = (saltHex + displayName + meWorld.ToString()).GetHash256();
+                                _lastPublishedSignature = null; // ensure future loop doesn't skip
+                                var okNow = await _api.PublishAsync(ep!, new[] { selfHash }, displayName, ct, _config.Current.AllowAutoDetectPairRequests).ConfigureAwait(false);
+                                _logger.LogInformation("Nearby immediate publish on toggle ON: {result}", okNow ? "success" : "failed");
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.LogDebug(ex, "Nearby immediate publish on toggle ON failed");
+                        }
+
+                        if (!_notifiedEnabled)
+                        {
+                            _mediator.Publish(new NotificationMessage("Nearby Detection", "AutoDetect enabled : you are now visible.", default));
+                            _notifiedEnabled = true;
+                            _notifiedDisabled = false;
+                            _disableSent = false;
+                        }
+                    }
+                    else
+                    {
+                        var ep = _configProvider.PublishEndpoint;
+                        if (!string.IsNullOrEmpty(ep) && !_disableSent)
+                        {
+                            var disableUrl = ep.Replace("/publish", "/disable");
+                            try { await _api.DisableAsync(disableUrl, ct).ConfigureAwait(false); _disableSent = true; } catch { }
+                        }
+                        if (!_notifiedDisabled)
+                        {
+                            _mediator.Publish(new NotificationMessage("Nearby Detection", "AutoDetect disabled : you are not visible.", default));
+                            _notifiedDisabled = true;
+                            _notifiedEnabled = false;
+                        }
+                    }
+                }
+                if (!_config.Current.EnableAutoDetectDiscovery || !_dalamud.IsLoggedIn || !_isConnected)
+                {
+                    if (!_config.Current.EnableAutoDetectDiscovery && !string.IsNullOrEmpty(_configProvider.PublishEndpoint))
+                    {
+                        var disableUrl = _configProvider.PublishEndpoint.Replace("/publish", "/disable");
+                        try
+                        {
+                            if (!_disableSent)
+                            {
+                                await _api.DisableAsync(disableUrl, ct).ConfigureAwait(false);
+                                _disableSent = true;
+                            }
+                        }
+                        catch { }
+
+                        if (!_notifiedDisabled)
+                        {
+                            _mediator.Publish(new NotificationMessage("Nearby Detection", "AutoDetect disabled : you are not visible.", default));
+                            _notifiedDisabled = true;
+                            _notifiedEnabled = false;
+                        }
+                    }
+                    await Task.Delay(1000, ct).ConfigureAwait(false);
+                    continue;
+                }
+                if (!_configProvider.HasConfig || _configProvider.IsExpired())
+                {
+                    if (!_configProvider.TryLoadFromStapled())
+                    {
+                        await _configProvider.TryFetchFromServerAsync(ct).ConfigureAwait(false);
+                    }
+                }
+                else if (!_loggedConfigReady && _configProvider.NearbyEnabled)
+                {
+                    _loggedConfigReady = true;
+                    _logger.LogInformation("Nearby: well-known loaded and enabled; refresh={refresh}s, expires={exp}", _configProvider.RefreshSec, _configProvider.SaltExpiresAt);
+                }
+
+                var entries = await GetLocalNearbyAsync().ConfigureAwait(false);
+                // Log when local count changes (including 0) to indicate activity
+                if (entries.Count != _lastLocalCount)
+                {
+                    _lastLocalCount = entries.Count;
+                    _logger.LogTrace("Nearby: {count} players detected locally", _lastLocalCount);
+                }
+
+                // Try query server if config and endpoints are present
+                if (_configProvider.NearbyEnabled && !_configProvider.IsExpired() &&
+                    _configProvider.Salt is { Length: > 0 })
+                {
+                    try
+                    {
+                        var saltHex = Convert.ToHexString(_configProvider.Salt!);
+                        // map hash->index for result matching
+                        Dictionary<string, int> hashToIndex = new(StringComparer.Ordinal);
+                        List<string> hashes = new(entries.Count);
+                        foreach (var (entry, idx) in entries.Select((e, i) => (e, i)))
+                        {
+                            var h = (saltHex + entry.Name + entry.WorldId.ToString()).GetHash256();
+                            hashToIndex[h] = idx;
+                            hashes.Add(h);
+                        }
+
+                        try
+                        {
+                            var snapSig = string.Join(',', hashes.OrderBy(s => s, StringComparer.Ordinal)).GetHash256();
+                            if (!string.Equals(snapSig, _lastSnapshotSig, StringComparison.Ordinal))
+                            {
+                                _lastSnapshotSig = snapSig;
+                                var sample = entries.Take(5).Select(e =>
+                                {
+                                    var hh = (saltHex + e.Name + e.WorldId.ToString()).GetHash256();
+                                    var shortH = hh.Length > 8 ? hh[..8] : hh;
+                                    return $"{e.Name}({e.WorldId})->{shortH}";
+                                });
+                                var saltShort = saltHex.Length > 8 ? saltHex[..8] : saltHex;
+                                _logger.LogTrace("Nearby snapshot: {count} entries; salt={saltShort}…; samples=[{samples}]",
+                                    entries.Count, saltShort, string.Join(", ", sample));
+                            }
+                        }
+                        catch { }
+
+                        if (!string.IsNullOrEmpty(_configProvider.PublishEndpoint))
+                        {
+                            string? displayName = null;
+                            string? selfHash = null;
+                            try
+                            {
+                                var me = await _dalamud.RunOnFrameworkThread(() => _dalamud.GetPlayerCharacter()).ConfigureAwait(false);
+                                if (me != null)
+                                {
+                                    displayName = me.Name.TextValue;
+                                    ushort meWorld = 0;
+                                    if (me is Dalamud.Game.ClientState.Objects.SubKinds.IPlayerCharacter mePc)
+                                        meWorld = (ushort)mePc.HomeWorld.RowId;
+                                    _logger.LogTrace("Nearby self ident: {name} ({world})", displayName, meWorld);
+                                    selfHash = (saltHex + displayName + meWorld.ToString()).GetHash256();
+                                }
+                            }
+                            catch { /* ignore */ }
+
+                            if (!string.IsNullOrEmpty(selfHash))
+                            {
+                                var sig = selfHash!;
+                                if (!string.Equals(sig, _lastPublishedSignature, StringComparison.Ordinal))
+                                {
+                                    _lastPublishedSignature = sig;
+                                    var shortSelf = selfHash!.Length > 8 ? selfHash[..8] : selfHash;
+                                    _logger.LogDebug("Nearby publish: self presence updated (hash={hash})", shortSelf);
+                                    var ok = await _api.PublishAsync(_configProvider.PublishEndpoint!, new[] { selfHash! }, displayName, ct, _config.Current.AllowAutoDetectPairRequests).ConfigureAwait(false);
+                                    _logger.LogInformation("Nearby publish result: {result}", ok ? "success" : "failed");
+                                    if (ok) _lastHeartbeat = DateTime.UtcNow;
+                                    if (ok)
+                                    {
+                                        if (!_notifiedEnabled)
+                                        {
+                                            _mediator.Publish(new NotificationMessage("Nearby Detection", "AutoDetect enabled : you are now visible.", default));
+                                            _notifiedEnabled = true;
+                                            _notifiedDisabled = false;
+                                            _disableSent = false; // allow future /disable when turning off again
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    // No changes; perform heartbeat publish if interval elapsed
+                                    if (DateTime.UtcNow - _lastHeartbeat >= HeartbeatInterval)
+                                    {
+                                        var okHb = await _api.PublishAsync(_configProvider.PublishEndpoint!, new[] { selfHash! }, displayName, ct, _config.Current.AllowAutoDetectPairRequests).ConfigureAwait(false);
+                                        _logger.LogDebug("Nearby heartbeat publish: {result}", okHb ? "success" : "failed");
+                                        if (okHb) _lastHeartbeat = DateTime.UtcNow;
+                                    }
+                                    else
+                                    {
+                                        _logger.LogDebug("Nearby publish skipped (no changes)");
+                                    }
+                                }
+                            }
+                            // else: no self character available; skip publish silently
+                        }
+
+                        // Query for matches if endpoint is available
+                        if (!string.IsNullOrEmpty(_configProvider.QueryEndpoint))
+                        {
+                            // chunked queries
+                            int batch = Math.Max(1, _configProvider.MaxQueryBatch);
+                            List<ServerMatch> allMatches = new();
+                            for (int i = 0; i < hashes.Count; i += batch)
+                            {
+                                var slice = hashes.Skip(i).Take(batch).ToArray();
+                                var res = await _api.QueryAsync(_configProvider.QueryEndpoint!, slice, ct).ConfigureAwait(false);
+                                if (res != null && res.Count > 0) allMatches.AddRange(res);
+                            }
+
+                            if (allMatches.Count > 0)
+                            {
+                                foreach (var m in allMatches)
+                                {
+                                    if (hashToIndex.TryGetValue(m.Hash, out var idx))
+                                    {
+                                        var e = entries[idx];
+                                        entries[idx] = new NearbyEntry(e.Name, e.WorldId, e.Distance, true, m.Token, m.DisplayName, m.Uid);
+                                    }
+                                }
+                            }
+                            if (allMatches.Count > 0)
+                            {
+                                _logger.LogInformation("Nearby: server returned {count} matches", allMatches.Count);
+                            }
+                            else
+                            {
+                                _logger.LogTrace("Nearby: server returned {count} matches", allMatches.Count);
+                            }
+
+                            // Log change in number of Umbra matches
+                            int matchCount = entries.Count(e => e.IsMatch);
+                            if (matchCount != _lastMatchCount)
+                            {
+                                _lastMatchCount = matchCount;
+                                if (matchCount > 0)
+                                {
+                                    var matchSamples = entries.Where(e => e.IsMatch).Take(5)
+                                        .Select(e => string.IsNullOrEmpty(e.DisplayName) ? e.Name : e.DisplayName!);
+                                    _logger.LogInformation("Nearby: {count} Umbra users nearby [{samples}]",
+                                        matchCount, string.Join(", ", matchSamples));
+                                }
+                                else
+                                {
+                                    _logger.LogTrace("Nearby: {count} Umbra users nearby", matchCount);
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogDebug(ex, "Nearby query failed; falling back to local list");
+                        if (ex.Message.Contains("DISCOVERY_SALT_EXPIRED", StringComparison.OrdinalIgnoreCase))
+                        {
+                            _logger.LogInformation("Nearby: salt expired, refetching well-known");
+                            try { await _configProvider.TryFetchFromServerAsync(ct).ConfigureAwait(false); } catch { }
+                        }
+                    }
+                }
+                else
+                {
+                    if (!_loggedLocalOnly)
+                    {
+                        _loggedLocalOnly = true;
+                        _logger.LogDebug("Nearby: well-known not available or disabled; running in local-only mode");
+                    }
+                }
+                _mediator.Publish(new DiscoveryListUpdated(entries));
+
+                var delayMs = Math.Max(1000, _configProvider.MinQueryIntervalMs);
+                if (entries.Count == 0) delayMs = Math.Max(delayMs, 5000);
+                await Task.Delay(delayMs, ct).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException) { }
+            catch (Exception ex)
+            {
+                _logger.LogDebug(ex, "NearbyDiscoveryService loop error");
+                await Task.Delay(2000, ct).ConfigureAwait(false);
+            }
+        }
+    }
+
+    private async Task<List<NearbyEntry>> GetLocalNearbyAsync()
+    {
+        var list = new List<NearbyEntry>();
+        try
+        {
+            var local = await _dalamud.RunOnFrameworkThread(() => _dalamud.GetPlayerCharacter()).ConfigureAwait(false);
+            var localPos = local?.Position ?? Vector3.Zero;
+            int maxDist = Math.Clamp(_config.Current.AutoDetectMaxDistanceMeters, 5, 100);
+
+            int limit = Math.Min(200, _objectTable.Length);
+            for (int i = 0; i < limit; i++)
+            {
+                var obj = await _dalamud.RunOnFrameworkThread(() => _objectTable[i]).ConfigureAwait(false);
+                if (obj == null || obj.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player) continue;
+                if (local != null && obj.Address == local.Address) continue;
+
+                float dist = local == null ? float.NaN : Vector3.Distance(localPos, obj.Position);
+                if (!float.IsNaN(dist) && dist > maxDist) continue;
+
+                string name = obj.Name.TextValue;
+                ushort worldId = 0;
+                if (obj is Dalamud.Game.ClientState.Objects.SubKinds.IPlayerCharacter pc)
+                    worldId = (ushort)pc.HomeWorld.RowId;
+
+                list.Add(new NearbyEntry(name, worldId, dist, false, null, null, null));
+            }
+        }
+        catch
+        {
+            // ignore
+        }
+        return list;
+    }
+}

MareSynchronos/Services/AutoDetect/NearbyPendingService.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using MareSynchronos.MareConfiguration.Models;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.WebAPI;
+using Microsoft.Extensions.Logging;
+
+namespace MareSynchronos.Services.AutoDetect;
+
+public sealed class NearbyPendingService : IMediatorSubscriber
+{
+    private readonly ILogger<NearbyPendingService> _logger;
+    private readonly MareMediator _mediator;
+    private readonly ApiController _api;
+    private readonly AutoDetectRequestService _requestService;
+    private readonly ConcurrentDictionary<string, string> _pending = new(StringComparer.Ordinal);
+    private static readonly Regex ReqRegex = new(@"^Nearby Request: (.+) \[(?<uid>[A-Z0-9]+)\]$", RegexOptions.Compiled);
+    private static readonly Regex AcceptRegex = new(@"^Nearby Accept: (.+) \[(?<uid>[A-Z0-9]+)\]$", RegexOptions.Compiled);
+
+    public NearbyPendingService(ILogger<NearbyPendingService> logger, MareMediator mediator, ApiController api, AutoDetectRequestService requestService)
+    {
+        _logger = logger;
+        _mediator = mediator;
+        _api = api;
+        _requestService = requestService;
+        _mediator.Subscribe<NotificationMessage>(this, OnNotification);
+        _mediator.Subscribe<ManualPairInviteMessage>(this, OnManualPairInvite);
+    }
+
+    public MareMediator Mediator => _mediator;
+
+    public IReadOnlyDictionary<string, string> Pending => _pending;
+
+    private void OnNotification(NotificationMessage msg)
+    {
+        // Watch info messages for Nearby request pattern
+        if (msg.Type != MareSynchronos.MareConfiguration.Models.NotificationType.Info) return;
+        var ma = AcceptRegex.Match(msg.Message);
+        if (ma.Success)
+        {
+            var uidA = ma.Groups["uid"].Value;
+            if (!string.IsNullOrEmpty(uidA))
+            {
+                _ = _api.UserAddPair(new MareSynchronos.API.Dto.User.UserDto(new MareSynchronos.API.Data.UserData(uidA)));
+                _pending.TryRemove(uidA, out _);
+                _requestService.RemovePendingRequestByUid(uidA);
+                _logger.LogInformation("NearbyPending: auto-accepted pairing with {uid}", uidA);
+            }
+            return;
+        }
+
+        var m = ReqRegex.Match(msg.Message);
+        if (!m.Success) return;
+        var uid = m.Groups["uid"].Value;
+        if (string.IsNullOrEmpty(uid)) return;
+        // Try to extract name as everything before space and '['
+        var name = msg.Message;
+        try
+        {
+            var idx = msg.Message.IndexOf(':');
+            if (idx >= 0) name = msg.Message[(idx + 1)..].Trim();
+            var br = name.LastIndexOf('[');
+            if (br > 0) name = name[..br].Trim();
+        }
+        catch { name = uid; }
+        _pending[uid] = name;
+        _logger.LogInformation("NearbyPending: received request from {uid} ({name})", uid, name);
+    }
+
+    private void OnManualPairInvite(ManualPairInviteMessage msg)
+    {
+        if (!string.Equals(msg.TargetUid, _api.UID, StringComparison.Ordinal))
+            return;
+
+        var display = !string.IsNullOrWhiteSpace(msg.DisplayName)
+            ? msg.DisplayName!
+            : (!string.IsNullOrWhiteSpace(msg.SourceAlias) ? msg.SourceAlias : msg.SourceUid);
+
+        _pending[msg.SourceUid] = display;
+        _logger.LogInformation("NearbyPending: received manual invite from {uid} ({name})", msg.SourceUid, display);
+        _mediator.Publish(new NotificationMessage("Nearby request", $"{display} vous a envoyé une invitation de pair.", NotificationType.Info, TimeSpan.FromSeconds(5)));
+    }
+
+    public void Remove(string uid)
+    {
+        _pending.TryRemove(uid, out _);
+        _requestService.RemovePendingRequestByUid(uid);
+    }
+
+    public async Task<bool> AcceptAsync(string uid)
+    {
+        try
+        {
+            await _api.UserAddPair(new MareSynchronos.API.Dto.User.UserDto(new MareSynchronos.API.Data.UserData(uid))).ConfigureAwait(false);
+            _pending.TryRemove(uid, out _);
+            _requestService.RemovePendingRequestByUid(uid);
+            _ = _requestService.SendAcceptNotifyAsync(uid);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "NearbyPending: accept failed for {uid}", uid);
+            return false;
+        }
+    }
+}

MareSynchronos/Services/CharaData/CharaDataNearbyManager.cs

@@ -201,7 +201,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
         foreach (var data in _metaInfoCache.Where(d => (string.IsNullOrWhiteSpace(UserNoteFilter)
             || ((d.Key.Alias ?? string.Empty).Contains(UserNoteFilter, StringComparison.OrdinalIgnoreCase)
             || d.Key.UID.Contains(UserNoteFilter, StringComparison.OrdinalIgnoreCase)
-            || (_serverConfigurationManager.GetNoteForUid(UserNoteFilter) ?? string.Empty).Contains(UserNoteFilter, StringComparison.OrdinalIgnoreCase))))
+            || (_serverConfigurationManager.GetNoteForUid(d.Key.UID) ?? string.Empty).Contains(UserNoteFilter, StringComparison.OrdinalIgnoreCase))))
             .ToDictionary(k => k.Key, k => k.Value))
         {
             // filter all poses based on territory, that always must be correct
@@ -266,26 +266,47 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
 
     private void ManageWispsNearby(List<PoseEntryExtended> previousPoses)
     {
-        foreach (var data in _nearbyData.Keys)
+        int maxWisps = _charaDataConfigService.Current.NearbyMaxWisps;
+        if (maxWisps <= 0)
         {
-            if (_poseVfx.TryGetValue(data, out var _)) continue;
+            ClearAllVfx();
+            return;
+        }
+
+        const int hardLimit = 200;
+        if (maxWisps > hardLimit) maxWisps = hardLimit;
+
+        var orderedAllowedPoses = _nearbyData
+            .OrderBy(kvp => kvp.Value.Distance)
+            .Take(maxWisps)
+            .Select(kvp => kvp.Key)
+            .ToList();
+
+        var allowedPoseSet = orderedAllowedPoses.ToHashSet();
+
+        foreach (var data in orderedAllowedPoses)
+        {
+            if (_poseVfx.TryGetValue(data, out _)) continue;
+
+            Guid? vfxGuid = data.MetaInfo.IsOwnData
+                ? _vfxSpawnManager.SpawnObject(data.Position, data.Rotation, Vector3.One * 2, 0.8f, 0.5f, 0.0f, 0.7f)
+                : _vfxSpawnManager.SpawnObject(data.Position, data.Rotation, Vector3.One * 2);
 
-            Guid? vfxGuid;
-            if (data.MetaInfo.IsOwnData)
-            {
-                vfxGuid = _vfxSpawnManager.SpawnObject(data.Position, data.Rotation, Vector3.One * 2, 0.8f, 0.5f, 0.0f, 0.7f);
-            }
-            else
-            {
-                vfxGuid = _vfxSpawnManager.SpawnObject(data.Position, data.Rotation, Vector3.One * 2);
-            }
             if (vfxGuid != null)
             {
                 _poseVfx[data] = vfxGuid.Value;
             }
         }
 
-        foreach (var data in previousPoses.Except(_nearbyData.Keys))
+        foreach (var data in previousPoses.Except(allowedPoseSet))
+        {
+            if (_poseVfx.Remove(data, out var guid))
+            {
+                _vfxSpawnManager.DespawnObject(guid);
+            }
+        }
+
+        foreach (var data in _poseVfx.Keys.Except(allowedPoseSet).ToList())
         {
             if (_poseVfx.Remove(data, out var guid))
             {

MareSynchronos/Services/CharacterAnalyzer.cs

@@ -1,7 +1,10 @@
-using Lumina.Data.Files;
+using System;
+using Lumina.Data.Files;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
 using MareSynchronos.FileCache;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.UI;
 using MareSynchronos.Utils;
@@ -13,11 +16,22 @@ public sealed class CharacterAnalyzer : DisposableMediatorSubscriberBase
 {
     private readonly FileCacheManager _fileCacheManager;
     private readonly XivDataAnalyzer _xivDataAnalyzer;
+    private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
     private CancellationTokenSource? _analysisCts;
     private CancellationTokenSource _baseAnalysisCts = new();
     private string _lastDataHash = string.Empty;
+    private CharacterAnalysisSummary _previousSummary = CharacterAnalysisSummary.Empty;
+    private DateTime _lastAutoAnalysis = DateTime.MinValue;
+    private string _lastAutoAnalysisHash = string.Empty;
+    private const int AutoAnalysisFileDeltaThreshold = 25;
+    private const long AutoAnalysisSizeDeltaThreshold = 50L * 1024 * 1024;
+    private static readonly TimeSpan AutoAnalysisCooldown = TimeSpan.FromMinutes(2);
+    private const long NotificationSizeThreshold = 300L * 1024 * 1024;
+    private const long NotificationTriangleThreshold = 150_000;
+    private bool _sizeWarningShown;
+    private bool _triangleWarningShown;
 
-    public CharacterAnalyzer(ILogger<CharacterAnalyzer> logger, MareMediator mediator, FileCacheManager fileCacheManager, XivDataAnalyzer modelAnalyzer)
+    public CharacterAnalyzer(ILogger<CharacterAnalyzer> logger, MareMediator mediator, FileCacheManager fileCacheManager, XivDataAnalyzer modelAnalyzer, PlayerPerformanceConfigService playerPerformanceConfigService)
         : base(logger, mediator)
     {
         Mediator.Subscribe<CharacterDataCreatedMessage>(this, (msg) =>
@@ -28,11 +42,14 @@ public sealed class CharacterAnalyzer : DisposableMediatorSubscriberBase
         });
         _fileCacheManager = fileCacheManager;
         _xivDataAnalyzer = modelAnalyzer;
+        _playerPerformanceConfigService = playerPerformanceConfigService;
     }
 
     public int CurrentFile { get; internal set; }
     public bool IsAnalysisRunning => _analysisCts != null;
     public int TotalFiles { get; internal set; }
+    public CharacterAnalysisSummary CurrentSummary { get; private set; } = CharacterAnalysisSummary.Empty;
+    public DateTime? LastCompletedAnalysis { get; private set; }
     internal Dictionary<ObjectKind, Dictionary<string, FileDataEntry>> LastAnalysis { get; } = [];
 
     public void CancelAnalyze()
@@ -80,8 +97,15 @@ public sealed class CharacterAnalyzer : DisposableMediatorSubscriberBase
             }
         }
 
+        RefreshSummary(false, _lastDataHash);
+
         Mediator.Publish(new CharacterDataAnalyzedMessage());
 
+        if (!cancelToken.IsCancellationRequested)
+        {
+            LastCompletedAnalysis = DateTime.UtcNow;
+        }
+
         _analysisCts.CancelDispose();
         _analysisCts = null;
 
@@ -142,9 +166,11 @@ public sealed class CharacterAnalyzer : DisposableMediatorSubscriberBase
             LastAnalysis[obj.Key] = data;
         }
 
+        _lastDataHash = charaData.DataHash.Value;
+        RefreshSummary(true, _lastDataHash);
+
         Mediator.Publish(new CharacterDataAnalyzedMessage());
 
-        _lastDataHash = charaData.DataHash.Value;
     }
 
     private void PrintAnalysis()
@@ -193,6 +219,168 @@ public sealed class CharacterAnalyzer : DisposableMediatorSubscriberBase
         Logger.LogInformation("IMPORTANT NOTES:\n\r- For uploads and downloads only the compressed size is relevant.\n\r- An unusually high total files count beyond 200 and up will also increase your download time to others significantly.");
     }
 
+    private void RefreshSummary(bool evaluateAutoAnalysis, string dataHash)
+    {
+        var summary = CalculateSummary();
+        CurrentSummary = summary;
+
+        if (evaluateAutoAnalysis)
+        {
+            EvaluateAutoAnalysis(summary, dataHash);
+        }
+        else
+        {
+            _previousSummary = summary;
+
+            if (!summary.HasUncomputedEntries && string.Equals(_lastAutoAnalysisHash, dataHash, StringComparison.Ordinal))
+            {
+                _lastAutoAnalysisHash = string.Empty;
+            }
+        }
+
+        EvaluateThresholdNotifications(summary);
+    }
+
+    private CharacterAnalysisSummary CalculateSummary()
+    {
+        if (LastAnalysis.Count == 0)
+        {
+            return CharacterAnalysisSummary.Empty;
+        }
+
+        long original = 0;
+        long compressed = 0;
+        long triangles = 0;
+        int files = 0;
+        bool hasUncomputed = false;
+
+        foreach (var obj in LastAnalysis.Values)
+        {
+            foreach (var entry in obj.Values)
+            {
+                files++;
+                original += entry.OriginalSize;
+                compressed += entry.CompressedSize;
+                triangles += entry.Triangles;
+                hasUncomputed |= !entry.IsComputed;
+            }
+        }
+
+        return new CharacterAnalysisSummary(files, original, compressed, triangles, hasUncomputed);
+    }
+
+    private void EvaluateAutoAnalysis(CharacterAnalysisSummary newSummary, string dataHash)
+    {
+        var previous = _previousSummary;
+        _previousSummary = newSummary;
+
+        if (newSummary.TotalFiles == 0)
+        {
+            return;
+        }
+
+        if (string.Equals(_lastAutoAnalysisHash, dataHash, StringComparison.Ordinal))
+        {
+            return;
+        }
+
+        if (IsAnalysisRunning)
+        {
+            return;
+        }
+
+        var now = DateTime.UtcNow;
+        if (now - _lastAutoAnalysis < AutoAnalysisCooldown)
+        {
+            return;
+        }
+
+        bool firstSummary = previous.TotalFiles == 0;
+        bool filesIncreased = newSummary.TotalFiles - previous.TotalFiles >= AutoAnalysisFileDeltaThreshold;
+        bool sizeIncreased = newSummary.TotalCompressedSize - previous.TotalCompressedSize >= AutoAnalysisSizeDeltaThreshold;
+        bool needsCompute = newSummary.HasUncomputedEntries;
+
+        if (!firstSummary && !filesIncreased && !sizeIncreased && !needsCompute)
+        {
+            return;
+        }
+
+        _lastAutoAnalysis = now;
+        _lastAutoAnalysisHash = dataHash;
+        _ = ComputeAnalysis(print: false);
+    }
+
+    private void EvaluateThresholdNotifications(CharacterAnalysisSummary summary)
+    {
+        if (summary.IsEmpty || summary.HasUncomputedEntries)
+        {
+            ResetThresholdFlagsIfNeeded(summary);
+            return;
+        }
+
+        if (!_playerPerformanceConfigService.Current.ShowSelfAnalysisWarnings)
+        {
+            ResetThresholdFlagsIfNeeded(summary);
+            return;
+        }
+
+        bool sizeExceeded = summary.TotalCompressedSize >= NotificationSizeThreshold;
+        bool trianglesExceeded = summary.TotalTriangles >= NotificationTriangleThreshold;
+        List<string> exceededReasons = new();
+
+        if (sizeExceeded && !_sizeWarningShown)
+        {
+            exceededReasons.Add($"un poids partagé de {UiSharedService.ByteToString(summary.TotalCompressedSize)} (≥ 300 MiB)");
+            _sizeWarningShown = true;
+        }
+        else if (!sizeExceeded && _sizeWarningShown)
+        {
+            _sizeWarningShown = false;
+        }
+
+        if (trianglesExceeded && !_triangleWarningShown)
+        {
+            exceededReasons.Add($"un total de {UiSharedService.TrisToString(summary.TotalTriangles)} triangles (≥ 150k)");
+            _triangleWarningShown = true;
+        }
+        else if (!trianglesExceeded && _triangleWarningShown)
+        {
+            _triangleWarningShown = false;
+        }
+
+        if (exceededReasons.Count == 0) return;
+
+        string combined = string.Join(" et ", exceededReasons);
+        string message = $"Attention : votre self-analysis indique {combined}. Des joueurs risquent de ne pas vous voir et UmbraSync peut activer un auto-pause. Pensez à réduire textures ou modèles lourds.";
+        Mediator.Publish(new DualNotificationMessage("Self Analysis", message, NotificationType.Warning));
+    }
+
+    private void ResetThresholdFlagsIfNeeded(CharacterAnalysisSummary summary)
+    {
+        if (summary.IsEmpty)
+        {
+            _sizeWarningShown = false;
+            _triangleWarningShown = false;
+            return;
+        }
+
+        if (summary.TotalCompressedSize < NotificationSizeThreshold)
+        {
+            _sizeWarningShown = false;
+        }
+
+        if (summary.TotalTriangles < NotificationTriangleThreshold)
+        {
+            _triangleWarningShown = false;
+        }
+    }
+
+    public readonly record struct CharacterAnalysisSummary(int TotalFiles, long TotalOriginalSize, long TotalCompressedSize, long TotalTriangles, bool HasUncomputedEntries)
+    {
+        public static CharacterAnalysisSummary Empty => new();
+        public bool IsEmpty => TotalFiles == 0 && TotalOriginalSize == 0 && TotalCompressedSize == 0 && TotalTriangles == 0;
+    }
+
     internal sealed record FileDataEntry(string Hash, string FileType, List<string> GamePaths, List<string> FilePaths, long OriginalSize, long CompressedSize, long Triangles)
     {
         public bool IsComputed => OriginalSize > 0 && CompressedSize > 0;
@@ -239,4 +427,4 @@ public sealed class CharacterAnalyzer : DisposableMediatorSubscriberBase
             }
         });
     }
-}
+}

MareSynchronos/Services/ChatService.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Text;
+using System.Threading;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
@@ -18,6 +21,7 @@ namespace MareSynchronos.Services;
 public class ChatService : DisposableMediatorSubscriberBase
 {
     public const int DefaultColor = 710;
+    private const string ManualPairInvitePrefix = "[UmbraPairInvite|";
     public const int CommandMaxNumber = 50;
 
     private readonly ILogger<ChatService> _logger;
@@ -30,6 +34,13 @@ public class ChatService : DisposableMediatorSubscriberBase
 
     private readonly Lazy<GameChatHooks> _gameChatHooks;
 
+    private readonly object _typingLock = new();
+    private CancellationTokenSource? _typingCts;
+    private bool _isTypingAnnounced;
+    private DateTime _lastTypingSent = DateTime.MinValue;
+    private static readonly TimeSpan TypingIdle = TimeSpan.FromSeconds(2);
+    private static readonly TimeSpan TypingResendInterval = TimeSpan.FromMilliseconds(750);
+
     public ChatService(ILogger<ChatService> logger, DalamudUtilService dalamudUtil, MareMediator mediator, ApiController apiController,
         PairManager pairManager, ILoggerFactory loggerFactory, IGameInteropProvider gameInteropProvider, IChatGui chatGui,
         MareConfigService mareConfig, ServerConfigurationManager serverConfigurationManager) : base(logger, mediator)
@@ -46,13 +57,12 @@ public class ChatService : DisposableMediatorSubscriberBase
         Mediator.Subscribe<GroupChatMsgMessage>(this, HandleGroupChat);
 
         _gameChatHooks = new(() => new GameChatHooks(loggerFactory.CreateLogger<GameChatHooks>(), gameInteropProvider, SendChatShell));
-
-        // Initialize chat hooks in advance
         _ = Task.Run(() =>
         {
             try
             {
                 _ = _gameChatHooks.Value;
+                _isTypingAnnounced = false;
             }
             catch (Exception ex)
             {
@@ -64,15 +74,86 @@ public class ChatService : DisposableMediatorSubscriberBase
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
+        _typingCts?.Cancel();
+        _typingCts?.Dispose();
         if (_gameChatHooks.IsValueCreated)
             _gameChatHooks.Value!.Dispose();
     }
+    public void NotifyTypingKeystroke()
+    {
+        lock (_typingLock)
+        {
+            var now = DateTime.UtcNow;
+            if (!_isTypingAnnounced || (now - _lastTypingSent) >= TypingResendInterval)
+            {
+                _ = Task.Run(async () =>
+                {
+                    try { await _apiController.UserSetTypingState(true).ConfigureAwait(false); }
+                    catch (Exception ex) { _logger.LogDebug(ex, "NotifyTypingKeystroke: failed to send typing=true"); }
+                });
+                _isTypingAnnounced = true;
+                _lastTypingSent = now;
+            }
+
+            _typingCts?.Cancel();
+            _typingCts?.Dispose();
+            _typingCts = new CancellationTokenSource();
+            var token = _typingCts.Token;
+
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    await Task.Delay(TypingIdle, token).ConfigureAwait(false);
+                    await _apiController.UserSetTypingState(false).ConfigureAwait(false);
+                }
+                catch (TaskCanceledException)
+                {
+                    // reset timer
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogDebug(ex, "NotifyTypingKeystroke: failed to send typing=false");
+                }
+                finally
+                {
+                    lock (_typingLock)
+                    {
+                        if (!token.IsCancellationRequested)
+                        {
+                            _isTypingAnnounced = false;
+                            _lastTypingSent = DateTime.MinValue;
+                        }
+                    }
+                }
+            });
+        }
+    }
+    public void ClearTypingState()
+    {
+        lock (_typingLock)
+        {
+            _typingCts?.Cancel();
+            _typingCts?.Dispose();
+            _typingCts = null;
+            if (_isTypingAnnounced)
+            {
+                _ = Task.Run(async () =>
+                {
+                    try { await _apiController.UserSetTypingState(false).ConfigureAwait(false); }
+                    catch (Exception ex) { _logger.LogDebug(ex, "ClearTypingState: failed to send typing=false"); }
+                });
+            _isTypingAnnounced = false;
+            _lastTypingSent = DateTime.MinValue;
+        }
+    }
+    }
 
     private void HandleUserChat(UserChatMsgMessage message)
     {
         var chatMsg = message.ChatMsg;
         var prefix = new SeStringBuilder();
-        prefix.AddText("[SnowChat] ");
+        prefix.AddText("[UmbraChat] ");
         _chatGui.Print(new XivChatEntry{
             MessageBytes = [..prefix.Build().Encode(), ..message.ChatMsg.PayloadContent],
             Name = chatMsg.SenderName,
@@ -113,6 +194,10 @@ public class ChatService : DisposableMediatorSubscriberBase
         var extraChatTags = _mareConfig.Current.ExtraChatTags;
         var logKind = ResolveShellLogKind(shellConfig.LogKind);
 
+        var payload = SeString.Parse(message.ChatMsg.PayloadContent);
+        if (TryHandleManualPairInvite(message, payload))
+            return;
+
         var msg = new SeStringBuilder();
         if (extraChatTags)
         {
@@ -124,7 +209,6 @@ public class ChatService : DisposableMediatorSubscriberBase
         msg.AddText($"[SS{shellNumber}]<");
         if (message.ChatMsg.Sender.UID.Equals(_apiController.UID, StringComparison.Ordinal))
         {
-            // Don't link to your own character
             msg.AddText(chatMsg.SenderName);
         }
         else
@@ -132,7 +216,7 @@ public class ChatService : DisposableMediatorSubscriberBase
             msg.Add(new PlayerPayload(chatMsg.SenderName, chatMsg.SenderHomeWorldId));
         }
         msg.AddText("> ");
-        msg.Append(SeString.Parse(message.ChatMsg.PayloadContent));
+        msg.Append(payload);
         if (color != 0)
             msg.AddUiForegroundOff();
 
@@ -143,7 +227,51 @@ public class ChatService : DisposableMediatorSubscriberBase
         });
     }
 
-    // Print an example message to the configured global chat channel
+    private bool TryHandleManualPairInvite(GroupChatMsgMessage message, SeString payload)
+    {
+        var textValue = payload.TextValue;
+        if (string.IsNullOrEmpty(textValue) || !textValue.StartsWith(ManualPairInvitePrefix, StringComparison.Ordinal))
+            return false;
+
+        var content = textValue[ManualPairInvitePrefix.Length..];
+        if (content.EndsWith("]", StringComparison.Ordinal))
+        {
+            content = content[..^1];
+        }
+
+        var parts = content.Split('|');
+        if (parts.Length < 4)
+            return true;
+
+        var sourceUid = parts[0];
+        var sourceAlias = DecodeInviteField(parts[1]);
+        var targetUid = parts[2];
+        var displayName = DecodeInviteField(parts[3]);
+        var inviteId = parts.Length > 4 ? parts[4] : Guid.NewGuid().ToString("N");
+
+        if (!string.Equals(targetUid, _apiController.UID, StringComparison.Ordinal))
+            return true;
+
+        Mediator.Publish(new ManualPairInviteMessage(sourceUid, sourceAlias, targetUid, string.IsNullOrEmpty(displayName) ? null : displayName, inviteId));
+        _logger.LogDebug("Received manual pair invite from {source} via syncshell", sourceUid);
+
+        return true;
+    }
+
+    private static string DecodeInviteField(string encoded)
+    {
+        if (string.IsNullOrEmpty(encoded)) return string.Empty;
+
+        try
+        {
+            var bytes = Convert.FromBase64String(encoded);
+            return Encoding.UTF8.GetString(bytes);
+        }
+        catch
+        {
+            return encoded;
+        }
+    }
     public void PrintChannelExample(string message, string gid = "")
     {
         int chatType = _mareConfig.Current.ChatLogKind;
@@ -164,8 +292,6 @@ public class ChatService : DisposableMediatorSubscriberBase
             Type = (XivChatType)chatType
         });
     }
-
-    // Called to update the active chat shell name if its renamed
     public void MaybeUpdateShellName(int shellNumber)
     {
         if (_mareConfig.Current.DisableSyncshellChat)
@@ -178,7 +304,6 @@ public class ChatService : DisposableMediatorSubscriberBase
             {
                 if (_gameChatHooks.IsValueCreated && _gameChatHooks.Value.ChatChannelOverride != null)
                 {
-                    // Very dumb and won't handle re-numbering -- need to identify the active chat channel more reliably later
                     if (_gameChatHooks.Value.ChatChannelOverride.ChannelName.StartsWith($"SS [{shellNumber}]", StringComparison.Ordinal))
                         SwitchChatShell(shellNumber);
                 }
@@ -197,7 +322,6 @@ public class ChatService : DisposableMediatorSubscriberBase
             if (shellConfig.Enabled && shellConfig.ShellNumber == shellNumber)
             {
                 var name = _serverConfigurationManager.GetNoteForGid(group.Key.GID) ?? group.Key.AliasOrGID;
-                // BUG: This doesn't always update the chat window e.g. when renaming a group
                 _gameChatHooks.Value.ChatChannelOverride = new()
                 {
                     ChannelName = $"SS [{shellNumber}]: {name}",
@@ -221,7 +345,6 @@ public class ChatService : DisposableMediatorSubscriberBase
             if (shellConfig.Enabled && shellConfig.ShellNumber == shellNumber)
             {
                 _ = Task.Run(async () => {
-                    // Should cache the name and home world instead of fetching it every time
                     var chatMsg = await _dalamudUtil.RunOnFrameworkThread(() => {
                         return new ChatMessage()
                         {
@@ -230,6 +353,7 @@ public class ChatService : DisposableMediatorSubscriberBase
                             PayloadContent = chatBytes
                         };
                     }).ConfigureAwait(false);
+                    ClearTypingState();
                     await _apiController.GroupChatSendMsg(new(group.Key), chatMsg).ConfigureAwait(false);
                 }).ConfigureAwait(false);
                 return;
@@ -238,4 +362,4 @@ public class ChatService : DisposableMediatorSubscriberBase
 
         _chatGui.PrintError($"[UmbraSync] Syncshell number #{shellNumber} not found");
     }
-}
+}

MareSynchronos/Services/ChatTwoCompatibilityService.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Dalamud.Plugin;
+using MareSynchronos.MareConfiguration.Models;
+using MareSynchronos.Services.Mediator;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace MareSynchronos.Services;
+
+public sealed class ChatTwoCompatibilityService : MediatorSubscriberBase, IHostedService
+{
+    private const string ChatTwoInternalName = "ChatTwo";
+    private readonly IDalamudPluginInterface _pluginInterface;
+    private bool _warningShown;
+
+    public ChatTwoCompatibilityService(ILogger<ChatTwoCompatibilityService> logger, IDalamudPluginInterface pluginInterface, MareMediator mediator)
+        : base(logger, mediator)
+    {
+        _pluginInterface = pluginInterface;
+
+        Mediator.SubscribeKeyed<PluginChangeMessage>(this, ChatTwoInternalName, OnChatTwoStateChanged);
+    }
+
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        try
+        {
+            var initialState = PluginWatcherService.GetInitialPluginState(_pluginInterface, ChatTwoInternalName);
+            if (initialState?.IsLoaded == true)
+            {
+                ShowWarning();
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogDebug(ex, "Failed to inspect ChatTwo initial state");
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        Mediator.UnsubscribeAll(this);
+        return Task.CompletedTask;
+    }
+
+    private void OnChatTwoStateChanged(PluginChangeMessage message)
+    {
+        if (message.IsLoaded)
+        {
+            ShowWarning();
+        }
+    }
+
+    private void ShowWarning()
+    {
+        if (_warningShown) return;
+        _warningShown = true;
+
+        const string warningTitle = "ChatTwo détecté";
+        const string warningBody = "Actuellement, le plugin ChatTwo n'est pas compatible avec la bulle d'écriture d'UmbraSync. Désactivez ChatTwo si vous souhaitez conserver l'indicateur de saisie.";
+
+        Mediator.Publish(new NotificationMessage(warningTitle, warningBody, NotificationType.Warning, TimeSpan.FromSeconds(10)));
+    }
+}

MareSynchronos/Services/ChatTypingDetectionService.cs

@@ -0,0 +1,294 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using Dalamud.Plugin.Services;
+using Dalamud.Utility;
+using Dalamud.Game.Text;
+using FFXIVClientStructs.FFXIV.Component.GUI;
+using FFXIVClientStructs.FFXIV.Client.UI.Shell;
+using Microsoft.Extensions.Logging;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.WebAPI;
+
+namespace MareSynchronos.Services;
+
+public sealed class ChatTypingDetectionService : IDisposable
+{
+    private readonly ILogger<ChatTypingDetectionService> _logger;
+    private readonly IFramework _framework;
+    private readonly IClientState _clientState;
+    private readonly IGameGui _gameGui;
+    private readonly ChatService _chatService;
+    private readonly TypingIndicatorStateService _typingStateService;
+    private readonly ApiController _apiController;
+    private readonly PairManager _pairManager;
+    private readonly IPartyList _partyList;
+
+    private string _lastChatText = string.Empty;
+    private bool _isTyping;
+    private bool _notifyingRemote;
+    private bool _serverSupportWarnLogged;
+    private bool _remoteNotificationsEnabled;
+
+    public ChatTypingDetectionService(ILogger<ChatTypingDetectionService> logger, IFramework framework,
+        IClientState clientState, IGameGui gameGui, ChatService chatService, PairManager pairManager, IPartyList partyList,
+        TypingIndicatorStateService typingStateService, ApiController apiController)
+    {
+        _logger = logger;
+        _framework = framework;
+        _clientState = clientState;
+        _gameGui = gameGui;
+        _chatService = chatService;
+        _pairManager = pairManager;
+        _partyList = partyList;
+        _typingStateService = typingStateService;
+        _apiController = apiController;
+
+        _framework.Update += OnFrameworkUpdate;
+        _logger.LogInformation("ChatTypingDetectionService initialized");
+    }
+
+    public void Dispose()
+    {
+        _framework.Update -= OnFrameworkUpdate;
+        ResetTypingState();
+    }
+
+    private void OnFrameworkUpdate(IFramework framework)
+    {
+        try
+        {
+            if (!_clientState.IsLoggedIn)
+            {
+                ResetTypingState();
+                return;
+            }
+
+            if (!TryGetChatInput(out var chatText) || string.IsNullOrEmpty(chatText))
+            {
+                ResetTypingState();
+                return;
+            }
+
+            if (IsIgnoredCommand(chatText))
+            {
+                ResetTypingState();
+                return;
+            }
+
+            var notifyRemote = ShouldNotifyRemote();
+            UpdateRemoteNotificationLogState(notifyRemote);
+            if (!notifyRemote && _notifyingRemote)
+            {
+                _chatService.ClearTypingState();
+                _notifyingRemote = false;
+            }
+
+            if (!_isTyping || !string.Equals(chatText, _lastChatText, StringComparison.Ordinal))
+            {
+                if (notifyRemote)
+                {
+                    _chatService.NotifyTypingKeystroke();
+                    _notifyingRemote = true;
+                }
+
+                _typingStateService.SetSelfTypingLocal(true);
+                _isTyping = true;
+            }
+
+            _lastChatText = chatText;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogTrace(ex, "ChatTypingDetectionService tick failed");
+        }
+    }
+
+    private void ResetTypingState()
+    {
+        if (!_isTyping)
+        {
+            _lastChatText = string.Empty;
+            return;
+        }
+
+        _isTyping = false;
+        _lastChatText = string.Empty;
+        _chatService.ClearTypingState();
+        _notifyingRemote = false;
+        _typingStateService.SetSelfTypingLocal(false);
+    }
+
+    private static bool IsIgnoredCommand(string chatText)
+    {
+        if (string.IsNullOrWhiteSpace(chatText))
+            return false;
+
+        var trimmed = chatText.TrimStart();
+        if (!trimmed.StartsWith('/'))
+            return false;
+
+        var firstTokenEnd = trimmed.IndexOf(' ');
+        var command = firstTokenEnd >= 0 ? trimmed[..firstTokenEnd] : trimmed;
+        command = command.TrimEnd();
+
+        var comparison = StringComparison.OrdinalIgnoreCase;
+        return command.StartsWith("/tell", comparison)
+            || command.StartsWith("/t", comparison)
+            || command.StartsWith("/xllog", comparison)
+            || command.StartsWith("/umbra", comparison)
+            || command.StartsWith("/fc", comparison)
+            || command.StartsWith("/freecompany", comparison);
+    }
+
+    private unsafe bool ShouldNotifyRemote()
+    {
+        try
+        {
+            var supportsTypingState = _apiController.SystemInfoDto.SupportsTypingState;
+            var connected = _apiController.IsConnected;
+            if (!connected || !supportsTypingState)
+            {
+                if (!_serverSupportWarnLogged)
+                {
+                    _logger.LogDebug("TypingDetection: server support unavailable (connected={connected}, supports={supports})", connected, supportsTypingState);
+                    _serverSupportWarnLogged = true;
+                }
+                return false;
+            }
+
+            _serverSupportWarnLogged = false;
+
+        var shellModule = RaptureShellModule.Instance();
+        if (shellModule == null)
+        {
+            _logger.LogDebug("TypingDetection: shell module null");
+            return true;
+        }
+
+            var chatType = (XivChatType)shellModule->ChatType;
+            switch (chatType)
+            {
+                case XivChatType.Say:
+                case XivChatType.Shout:
+                case XivChatType.Yell:
+                    return true;
+                case XivChatType.Party:
+                case XivChatType.CrossParty:
+                    var eligible = PartyContainsPairedMember();
+                    return eligible;
+                case XivChatType.Debug:
+                    return true;
+                default:
+                    _logger.LogTrace("TypingDetection: channel {type} rejected", chatType);
+                    return false;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogTrace(ex, "ChatTypingDetectionService: failed to evaluate chat channel");
+        }
+
+        return true;
+    }
+
+    private bool PartyContainsPairedMember()
+    {
+        try
+        {
+            var pairedNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var pair in _pairManager.GetOnlineUserPairs())
+            {
+                if (!string.IsNullOrEmpty(pair.PlayerName))
+                    pairedNames.Add(pair.PlayerName);
+            }
+
+            if (pairedNames.Count == 0)
+            {
+            _logger.LogDebug("TypingDetection: no paired names online");
+            return false;
+            }
+
+            foreach (var member in _partyList)
+            {
+                var name = member?.Name?.TextValue;
+                if (string.IsNullOrEmpty(name))
+                    continue;
+
+                if (pairedNames.Contains(name))
+                {
+                    return true;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "ChatTypingDetectionService: failed to check party composition");
+        }
+
+        _logger.LogDebug("TypingDetection: no paired members in party");
+        return false;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private unsafe bool TryGetChatInput(out string chatText)
+    {
+        chatText = string.Empty;
+
+        var addon = _gameGui.GetAddonByName("ChatLog", 1);
+        if (addon.Address == nint.Zero)
+            return false;
+
+        var chatLog = (AtkUnitBase*)addon.Address;
+        if (chatLog == null || !chatLog->IsVisible)
+            return false;
+
+        var textInputNode = chatLog->UldManager.NodeList[16];
+        if (textInputNode == null)
+            return false;
+
+        var componentNode = textInputNode->GetAsAtkComponentNode();
+        if (componentNode == null || componentNode->Component == null)
+            return false;
+
+        var cursorNode = componentNode->Component->UldManager.NodeList[14];
+        if (cursorNode == null)
+            return false;
+
+        var cursorVisible = cursorNode->IsVisible();
+        if (!cursorVisible)
+        {
+            return false;
+        }
+
+        var chatInputNode = componentNode->Component->UldManager.NodeList[1];
+        if (chatInputNode == null)
+            return false;
+
+        var textNode = chatInputNode->GetAsAtkTextNode();
+        if (textNode == null)
+            return false;
+
+        var rawText = textNode->GetText();
+        if (rawText == null)
+            return false;
+
+        chatText = rawText.AsDalamudSeString().ToString();
+        return true;
+    }
+
+    private void UpdateRemoteNotificationLogState(bool notifyRemote)
+    {
+        if (notifyRemote && !_remoteNotificationsEnabled)
+        {
+            _remoteNotificationsEnabled = true;
+            _logger.LogInformation("TypingDetection: remote notifications enabled");
+        }
+        else if (!notifyRemote && _remoteNotificationsEnabled)
+        {
+            _remoteNotificationsEnabled = false;
+            _logger.LogInformation("TypingDetection: remote notifications disabled");
+        }
+    }
+}

MareSynchronos/Services/CommandManagerService.cs

@@ -9,15 +9,15 @@ using MareSynchronos.UI;
 using MareSynchronos.WebAPI;
 using System.Globalization;
 using System.Text;
+using System.Numerics;
 
 namespace MareSynchronos.Services;
 
 public sealed class CommandManagerService : IDisposable
 {
-    private const string _commandName = "/sync";
-    private const string _commandName2 = "/umbra";
-
-    private const string _ssCommandPrefix = "/ss";
+    private const string _commandName = "/usync";
+    private const string _autoDetectCommand = "/autodetect";
+    private const string _ssCommandPrefix = "/ums";
 
     private readonly ApiController _apiController;
     private readonly ICommandManager _commandManager;
@@ -42,11 +42,12 @@ public sealed class CommandManagerService : IDisposable
         _mareConfigService = mareConfigService;
         _commandManager.AddHandler(_commandName, new CommandInfo(OnCommand)
         {
-            HelpMessage = "Opens the Umbra UI"
+            HelpMessage = "Opens the UmbraSync UI"
         });
-        _commandManager.AddHandler(_commandName2, new CommandInfo(OnCommand)
+
+        _commandManager.AddHandler(_autoDetectCommand, new CommandInfo(OnAutoDetectCommand)
         {
-            HelpMessage = "Opens the Umbra UI"
+            HelpMessage = "Opens the AutoDetect window"
         });
 
         // Lazy registration of all possible /ss# commands which tbf is what the game does for linkshells anyway
@@ -62,12 +63,21 @@ public sealed class CommandManagerService : IDisposable
     public void Dispose()
     {
         _commandManager.RemoveHandler(_commandName);
-        _commandManager.RemoveHandler(_commandName2);
+        _commandManager.RemoveHandler(_autoDetectCommand);
 
         for (int i = 1; i <= ChatService.CommandMaxNumber; ++i)
             _commandManager.RemoveHandler($"{_ssCommandPrefix}{i}");
     }
 
+    private void OnAutoDetectCommand(string command, string args)
+    {
+        UiSharedService.AccentColor = new Vector4(0x8D / 255f, 0x37 / 255f, 0xC0 / 255f, 1f);
+        UiSharedService.AccentHoverColor = new Vector4(0x3A / 255f, 0x15 / 255f, 0x50 / 255f, 1f);
+        UiSharedService.AccentActiveColor = UiSharedService.AccentHoverColor;
+        _mediator.Publish(new UiToggleMessage(typeof(AutoDetectUi)));
+    }
+
+
     private void OnCommand(string command, string args)
     {
         var splitArgs = args.ToLowerInvariant().Trim().Split(" ", StringSplitOptions.RemoveEmptyEntries);
@@ -147,9 +157,8 @@ public sealed class CommandManagerService : IDisposable
         }
         else
         {
-            // FIXME: Chat content seems to already be stripped of any special characters here?
             byte[] chatBytes = Encoding.UTF8.GetBytes(args);
             _chatService.SendChatShell(shellNumber, chatBytes);
         }
     }
-}
+}

MareSynchronos/Services/DalamudUtilService.cs

@@ -20,6 +20,8 @@ using Microsoft.Extensions.Logging;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System;
+using System.Collections.Generic;
 using GameObject = FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject;
 using DalamudGameObject = Dalamud.Game.ClientState.Objects.Types.IGameObject;
 
@@ -52,6 +54,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private readonly ILogger<DalamudUtilService> _logger;
     private readonly IObjectTable _objectTable;
     private readonly PerformanceCollectorService _performanceCollector;
+    private readonly Dictionary<string, ConditionFlag> _conditionLookup = new(StringComparer.OrdinalIgnoreCase);
     private uint? _classJobId = 0;
     private DateTime _delayedFrameworkUpdateCheck = DateTime.UtcNow;
     private string _lastGlobalBlockPlayer = string.Empty;
@@ -172,6 +175,20 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public bool IsInCombatOrPerforming { get; private set; } = false;
     public bool HasModifiedGameFiles => _gameData.HasModifiedGameDataFiles;
 
+    public bool IsConditionActive(string flagName)
+    {
+        if (_conditionLookup.TryGetValue(flagName, out var cachedFlag))
+            return _condition[cachedFlag];
+
+        if (Enum.TryParse<ConditionFlag>(flagName, true, out var flag))
+        {
+            _conditionLookup[flagName] = flag;
+            return _condition[flag];
+        }
+
+        return false;
+    }
+
     public Lazy<Dictionary<ushort, string>> WorldData { get; private set; }
     public Lazy<Dictionary<int, Lumina.Excel.Sheets.UIColor>> UiColors { get; private set; }
     public Lazy<Dictionary<uint, string>> TerritoryData { get; private set; }

MareSynchronos/Services/GuiHookService.cs

@@ -1,12 +1,16 @@
+using System;
 using Dalamud.Game.Gui.NamePlate;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Plugin.Services;
+using MareSynchronos.API.Dto.User;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.UI;
+using MareSynchronos.WebAPI;
 using Microsoft.Extensions.Logging;
+using Dalamud.Game.Text;
 
 namespace MareSynchronos.Services;
 
@@ -19,12 +23,18 @@ public class GuiHookService : DisposableMediatorSubscriberBase
     private readonly IGameConfig _gameConfig;
     private readonly IPartyList _partyList;
     private readonly PairManager _pairManager;
+    private readonly IClientState _clientState;
+    private readonly ApiController _apiController;
+    private readonly TypingIndicatorStateService _typingStateService;
+
+    private static readonly TimeSpan TypingDisplayTime = TimeSpan.FromSeconds(2);
 
     private bool _isModified = false;
     private bool _namePlateRoleColorsEnabled = false;
 
     public GuiHookService(ILogger<GuiHookService> logger, DalamudUtilService dalamudUtil, MareMediator mediator, MareConfigService configService,
-        INamePlateGui namePlateGui, IGameConfig gameConfig, IPartyList partyList, PairManager pairManager)
+        INamePlateGui namePlateGui, IGameConfig gameConfig, IPartyList partyList, PairManager pairManager, ApiController apiController,
+        IClientState clientState, TypingIndicatorStateService typingStateService)
         : base(logger, mediator)
     {
         _logger = logger;
@@ -34,6 +44,9 @@ public class GuiHookService : DisposableMediatorSubscriberBase
         _gameConfig = gameConfig;
         _partyList = partyList;
         _pairManager = pairManager;
+        _apiController = apiController;
+        _clientState = clientState;
+        _typingStateService = typingStateService;
 
         _namePlateGui.OnNamePlateUpdate += OnNamePlateUpdate;
         _namePlateGui.RequestRedraw();
@@ -41,16 +54,24 @@ public class GuiHookService : DisposableMediatorSubscriberBase
         Mediator.Subscribe<DelayedFrameworkUpdateMessage>(this, (_) => GameSettingsCheck());
         Mediator.Subscribe<PairHandlerVisibleMessage>(this, (_) => RequestRedraw());
         Mediator.Subscribe<NameplateRedrawMessage>(this, (_) => RequestRedraw());
+        Mediator.Subscribe<UserTypingStateMessage>(this, (_) => RequestRedraw());
     }
 
     public void RequestRedraw(bool force = false)
     {
-        if (!_configService.Current.UseNameColors)
+        var useColors = _configService.Current.UseNameColors;
+        var showTyping = _configService.Current.TypingIndicatorShowOnNameplates;
+
+        if (!useColors && !showTyping)
         {
             if (!_isModified && !force)
                 return;
             _isModified = false;
         }
+        else if (!useColors)
+        {
+            _isModified = false;
+        }
 
         _ = Task.Run(async () => {
             await _dalamudUtil.RunOnFrameworkThread(() => _namePlateGui.RequestRedraw()).ConfigureAwait(false);
@@ -69,7 +90,9 @@ public class GuiHookService : DisposableMediatorSubscriberBase
 
     private void OnNamePlateUpdate(INamePlateUpdateContext context, IReadOnlyList<INamePlateUpdateHandler> handlers)
     {
-        if (!_configService.Current.UseNameColors)
+        var applyColors = _configService.Current.UseNameColors;
+        var showTypingIndicator = _configService.Current.TypingIndicatorShowOnNameplates;
+        if (!applyColors && !showTypingIndicator)
             return;
 
         var visibleUsers = _pairManager.GetOnlineUserPairs().Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue);
@@ -82,6 +105,11 @@ public class GuiHookService : DisposableMediatorSubscriberBase
         for (int i = 0; i < _partyList.Count; ++i)
             partyMembers[i] = _partyList[i]?.GameObject?.Address ?? nint.MaxValue;
 
+        var now = DateTime.UtcNow;
+        var activeTypers = _typingStateService.GetActiveTypers(TypingDisplayTime);
+        var selfTypingActive = showTypingIndicator && _typingStateService.TryGetSelfTyping(TypingDisplayTime, out _, out _);
+        var localPlayerAddress = selfTypingActive ? _clientState.LocalPlayer?.Address ?? nint.Zero : nint.Zero;
+
         foreach (var handler in handlers)
         {
             if (handler != null && visibleUsersIds.Contains(handler.GameObjectId))
@@ -89,13 +117,18 @@ public class GuiHookService : DisposableMediatorSubscriberBase
                 if (_namePlateRoleColorsEnabled && partyMembers.Contains(handler.GameObject?.Address ?? nint.MaxValue))
                     continue;
                 var pair = visibleUsersDict[handler.GameObjectId];
-                var colors = !pair.IsApplicationBlocked ? _configService.Current.NameColors : _configService.Current.BlockedNameColors;
-                handler.NameParts.TextWrap = (
-                    BuildColorStartSeString(colors),
-                    BuildColorEndSeString(colors)
-                );
-                _isModified = true;
+                if (applyColors)
+                {
+                    var colors = !pair.IsApplicationBlocked ? _configService.Current.NameColors : _configService.Current.BlockedNameColors;
+                    handler.NameParts.TextWrap = (
+                        BuildColorStartSeString(colors),
+                        BuildColorEndSeString(colors)
+                    );
+                    _isModified = true;
+                }
+
             }
+
         }
     }
 

MareSynchronos/Services/Mediator/Messages.cs

@@ -3,6 +3,7 @@ using MareSynchronos.API.Data;
 using MareSynchronos.API.Dto;
 using MareSynchronos.API.Dto.CharaData;
 using MareSynchronos.API.Dto.Group;
+using MareSynchronos.API.Dto.User;
 using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.PlayerData.Pairs;
@@ -12,7 +13,7 @@ using System.Numerics;
 
 namespace MareSynchronos.Services.Mediator;
 
-#pragma warning disable MA0048 // File name must match type name
+#pragma warning disable MA0048
 #pragma warning disable S2094
 public record SwitchToIntroUiMessage : MessageBase;
 public record SwitchToMainUiMessage : MessageBase;
@@ -52,6 +53,7 @@ public record HaltScanMessage(string Source) : MessageBase;
 public record ResumeScanMessage(string Source) : MessageBase;
 public record NotificationMessage
     (string Title, string Message, NotificationType Type, TimeSpan? TimeShownOnScreen = null) : MessageBase;
+public record DualNotificationMessage(string Title, string Message, NotificationType Type, TimeSpan? ToastDuration = null) : MessageBase;
 public record CreateCacheForObjectMessage(GameObjectHandler ObjectToCreateFor) : MessageBase;
 public record ClearCacheForObjectMessage(GameObjectHandler ObjectToCreateFor) : MessageBase;
 public record CharacterDataCreatedMessage(CharacterData CharacterData) : SameThreadMessage;
@@ -90,6 +92,7 @@ public record PenumbraDirectoryChangedMessage(string? ModDirectory) : MessageBas
 public record PenumbraRedrawCharacterMessage(ICharacter Character) : SameThreadMessage;
 public record UserChatMsgMessage(SignedChatMessage ChatMsg) : MessageBase;
 public record GroupChatMsgMessage(GroupDto GroupInfo, SignedChatMessage ChatMsg) : MessageBase;
+public record UserTypingStateMessage(TypingStateDto Typing) : MessageBase;
 public record RecalculatePerformanceMessage(string? UID) : MessageBase;
 public record NameplateRedrawMessage : MessageBase;
 public record HoldPairApplicationMessage(string UID, string Source) : KeyedMessage(UID);
@@ -108,6 +111,17 @@ public record GPoseLobbyReceiveCharaData(CharaDataDownloadDto CharaDataDownloadD
 public record GPoseLobbyReceivePoseData(UserData UserData, PoseData PoseData) : MessageBase;
 public record GPoseLobbyReceiveWorldData(UserData UserData, WorldData WorldData) : MessageBase;
 
+public record NearbyEntry(string Name, ushort WorldId, float Distance, bool IsMatch, string? Token, string? DisplayName, string? Uid, bool AcceptPairRequests = true);
+public record DiscoveryListUpdated(List<NearbyEntry> Entries) : MessageBase;
+public record NearbyDetectionToggled(bool Enabled) : MessageBase;
+public record AllowPairRequestsToggled(bool Enabled) : MessageBase;
+public record ManualPairInviteMessage(string SourceUid, string SourceAlias, string TargetUid, string? DisplayName, string InviteId) : MessageBase;
+public record ApplyDefaultPairPermissionsMessage(UserPairDto Pair) : MessageBase;
+public record ApplyDefaultGroupPermissionsMessage(GroupPairFullInfoDto GroupPair) : MessageBase;
+public record ApplyDefaultsToAllSyncsMessage(string? Context = null, bool? Disabled = null) : MessageBase;
+public record PairSyncOverrideChanged(string Uid, bool? DisableSounds, bool? DisableAnimations, bool? DisableVfx) : MessageBase;
+public record GroupSyncOverrideChanged(string Gid, bool? DisableSounds, bool? DisableAnimations, bool? DisableVfx) : MessageBase;
+
 public record PluginChangeMessage(string InternalName, Version Version, bool IsLoaded) : KeyedMessage(InternalName);
 #pragma warning restore S2094
-#pragma warning restore MA0048 // File name must match type name
+#pragma warning restore MA0048

MareSynchronos/Services/NotificationService.cs

@@ -1,4 +1,5 @@
-using Dalamud.Game.Text.SeStringHandling;
+using System;
+using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Services;
 using MareSynchronos.MareConfiguration;
@@ -31,6 +32,7 @@ public class NotificationService : DisposableMediatorSubscriberBase, IHostedServ
     public Task StartAsync(CancellationToken cancellationToken)
     {
         Mediator.Subscribe<NotificationMessage>(this, ShowNotification);
+        Mediator.Subscribe<DualNotificationMessage>(this, ShowDualNotification);
         return Task.CompletedTask;
     }
 
@@ -81,41 +83,103 @@ public class NotificationService : DisposableMediatorSubscriberBase, IHostedServ
 
         if (!_dalamudUtilService.IsLoggedIn) return;
 
-        switch (msg.Type)
+        bool appendInstruction;
+        bool forceChat = ShouldForceChat(msg, out appendInstruction);
+        var effectiveMessage = forceChat && appendInstruction ? AppendAutoDetectInstruction(msg.Message) : msg.Message;
+        var adjustedMsg = forceChat && appendInstruction ? msg with { Message = effectiveMessage } : msg;
+
+        switch (adjustedMsg.Type)
         {
             case NotificationType.Info:
-                ShowNotificationLocationBased(msg, _configurationService.Current.InfoNotification);
+                ShowNotificationLocationBased(adjustedMsg, _configurationService.Current.InfoNotification, forceChat);
                 break;
 
             case NotificationType.Warning:
-                ShowNotificationLocationBased(msg, _configurationService.Current.WarningNotification);
+                ShowNotificationLocationBased(adjustedMsg, _configurationService.Current.WarningNotification, forceChat);
                 break;
 
             case NotificationType.Error:
-                ShowNotificationLocationBased(msg, _configurationService.Current.ErrorNotification);
+                ShowNotificationLocationBased(adjustedMsg, _configurationService.Current.ErrorNotification, forceChat);
                 break;
         }
     }
 
-    private void ShowNotificationLocationBased(NotificationMessage msg, NotificationLocation location)
+    private void ShowDualNotification(DualNotificationMessage message)
     {
-        switch (location)
+        if (!_dalamudUtilService.IsLoggedIn) return;
+
+        var baseMsg = new NotificationMessage(message.Title, message.Message, message.Type, message.ToastDuration);
+        ShowToast(baseMsg);
+        ShowChat(baseMsg);
+    }
+
+    private static bool ShouldForceChat(NotificationMessage msg, out bool appendInstruction)
+    {
+        appendInstruction = false;
+
+        bool IsNearbyRequestText(string? text)
         {
-            case NotificationLocation.Toast:
-                ShowToast(msg);
-                break;
+            if (string.IsNullOrEmpty(text)) return false;
+            return text.Contains("Nearby request", StringComparison.OrdinalIgnoreCase)
+                || text.Contains("Nearby Request", StringComparison.Ordinal);
+        }
 
-            case NotificationLocation.Chat:
-                ShowChat(msg);
-                break;
+        bool IsNearbyAcceptText(string? text)
+        {
+            if (string.IsNullOrEmpty(text)) return false;
+            return text.Contains("Nearby Accept", StringComparison.OrdinalIgnoreCase);
+        }
 
-            case NotificationLocation.Both:
-                ShowToast(msg);
-                ShowChat(msg);
-                break;
+        bool isAccept = IsNearbyAcceptText(msg.Title) || IsNearbyAcceptText(msg.Message);
+        if (isAccept)
+            return false;
 
-            case NotificationLocation.Nowhere:
-                break;
+        bool isRequest = IsNearbyRequestText(msg.Title) || IsNearbyRequestText(msg.Message);
+        if (isRequest)
+        {
+            appendInstruction = !IsRequestSentConfirmation(msg);
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool IsRequestSentConfirmation(NotificationMessage msg)
+    {
+        if (string.Equals(msg.Title, "Nearby request sent", StringComparison.OrdinalIgnoreCase))
+            return true;
+
+        if (!string.IsNullOrEmpty(msg.Message) && msg.Message.Contains("The other user will receive a request notification.", StringComparison.OrdinalIgnoreCase))
+            return true;
+
+        return false;
+    }
+
+    private static string AppendAutoDetectInstruction(string? message)
+    {
+        const string suffix = " | Ouvrez /autodetect pour gérer l'invitation.";
+        if (string.IsNullOrWhiteSpace(message))
+            return suffix.TrimStart(' ', '|');
+
+        if (message.Contains("/autodetect", StringComparison.OrdinalIgnoreCase))
+            return message;
+
+        return message.TrimEnd() + suffix;
+    }
+
+    private void ShowNotificationLocationBased(NotificationMessage msg, NotificationLocation location, bool forceChat)
+    {
+        bool showToast = location is NotificationLocation.Toast or NotificationLocation.Both;
+        bool showChat = forceChat || location is NotificationLocation.Chat or NotificationLocation.Both;
+
+        if (showToast)
+        {
+            ShowToast(msg);
+        }
+
+        if (showChat)
+        {
+            ShowChat(msg);
         }
     }
 
@@ -138,4 +202,4 @@ public class NotificationService : DisposableMediatorSubscriberBase, IHostedServ
             InitialDuration = msg.TimeShownOnScreen ?? TimeSpan.FromSeconds(3)
         });
     }
-}
+}

MareSynchronos/Services/PartyListTypingService.cs

@@ -0,0 +1,78 @@
+using MareSynchronos.MareConfiguration;
+using System.Collections.Generic;
+using MareSynchronos.PlayerData.Pairs;
+using System;
+using System.Linq;
+using Dalamud.Game.Text;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Game.Text.SeStringHandling.Payloads;
+using Dalamud.Plugin.Services;
+using MareSynchronos.API.Dto.User;
+using MareSynchronos.Services.Mediator;
+using Microsoft.Extensions.Logging;
+
+namespace MareSynchronos.Services;
+
+public class PartyListTypingService : DisposableMediatorSubscriberBase
+{
+    private readonly ILogger<PartyListTypingService> _logger;
+    private readonly IPartyList _partyList;
+    private readonly MareConfigService _configService;
+    private readonly PairManager _pairManager;
+    private readonly TypingIndicatorStateService _typingStateService;
+    private static readonly TimeSpan TypingDisplayTime = TimeSpan.FromSeconds(2);
+    private static readonly TimeSpan TypingDisplayDelay = TimeSpan.FromMilliseconds(500);
+    private static readonly TimeSpan TypingDisplayFade = TypingDisplayTime;
+
+    public PartyListTypingService(ILogger<PartyListTypingService> logger,
+        MareMediator mediator,
+        IPartyList partyList,
+        PairManager pairManager,
+        MareConfigService configService,
+        TypingIndicatorStateService typingStateService)
+        : base(logger, mediator)
+    {
+        _logger = logger;
+        _partyList = partyList;
+        _pairManager = pairManager;
+        _configService = configService;
+        _typingStateService = typingStateService;
+
+    }
+
+    public void Draw()
+    {
+        if (!_configService.Current.TypingIndicatorShowOnPartyList) return;
+        // Build map of visible users by AliasOrUID -> UID (case-insensitive)
+        var visibleByAlias = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        try
+        {
+            var visibleUsers = _pairManager.GetVisibleUsers();
+            foreach (var u in visibleUsers)
+            {
+                var alias = string.IsNullOrEmpty(u.AliasOrUID) ? u.UID : u.AliasOrUID;
+                if (!visibleByAlias.ContainsKey(alias)) visibleByAlias[alias] = u.UID;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "PartyListTypingService: failed to get visible users");
+        }
+
+        var activeTypers = _typingStateService.GetActiveTypers(TypingDisplayTime);
+        var now = DateTime.UtcNow;
+
+        foreach (var member in _partyList)
+        {
+            if (string.IsNullOrEmpty(member.Name?.TextValue)) continue;
+
+            var displayName = member.Name.TextValue;
+            if (visibleByAlias.TryGetValue(displayName, out var uid)
+                && activeTypers.TryGetValue(uid, out var entry)
+                && (now - entry.LastUpdate) <= TypingDisplayFade)
+            {
+                _logger.LogDebug("PartyListTypingService: bubble would be shown for {name}", displayName);
+            }
+        }
+    }
+}

MareSynchronos/Services/SyncDefaultsService.cs

@@ -0,0 +1,358 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MareSynchronos.API.Data;
+using MareSynchronos.API.Data.Enum;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.API.Dto.User;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.MareConfiguration.Configurations;
+using MareSynchronos.MareConfiguration.Models;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.WebAPI;
+using Microsoft.Extensions.Logging;
+using NotificationType = MareSynchronos.MareConfiguration.Models.NotificationType;
+
+namespace MareSynchronos.Services;
+
+public sealed class SyncDefaultsService : DisposableMediatorSubscriberBase
+{
+    private readonly ApiController _apiController;
+    private readonly MareConfigService _configService;
+    private readonly PairManager _pairManager;
+
+    public SyncDefaultsService(ILogger<SyncDefaultsService> logger, MareMediator mediator,
+        MareConfigService configService, ApiController apiController, PairManager pairManager) : base(logger, mediator)
+    {
+        _configService = configService;
+        _apiController = apiController;
+        _pairManager = pairManager;
+
+        Mediator.Subscribe<ApplyDefaultPairPermissionsMessage>(this, OnApplyPairDefaults);
+        Mediator.Subscribe<ApplyDefaultGroupPermissionsMessage>(this, OnApplyGroupDefaults);
+        Mediator.Subscribe<ApplyDefaultsToAllSyncsMessage>(this, msg => ApplyDefaultsToAll(msg));
+        Mediator.Subscribe<PairSyncOverrideChanged>(this, OnPairOverrideChanged);
+        Mediator.Subscribe<GroupSyncOverrideChanged>(this, OnGroupOverrideChanged);
+    }
+
+    private void OnApplyPairDefaults(ApplyDefaultPairPermissionsMessage message)
+    {
+        var config = _configService.Current;
+        var permissions = message.Pair.OwnPermissions;
+        var overrides = TryGetPairOverride(message.Pair.User.UID);
+        if (!ApplyDefaults(ref permissions, config, overrides))
+            return;
+
+        _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(message.Pair.User, permissions));
+    }
+
+    private void OnApplyGroupDefaults(ApplyDefaultGroupPermissionsMessage message)
+    {
+        if (!string.Equals(message.GroupPair.User.UID, _apiController.UID, StringComparison.Ordinal))
+            return;
+
+        var config = _configService.Current;
+        var permissions = message.GroupPair.GroupUserPermissions;
+        var overrides = TryGetGroupOverride(message.GroupPair.Group.GID);
+        if (!ApplyDefaults(ref permissions, config, overrides))
+            return;
+
+        _ = _apiController.GroupChangeIndividualPermissionState(new GroupPairUserPermissionDto(message.GroupPair.Group, message.GroupPair.User, permissions));
+    }
+
+    private async Task ApplyDefaultsToAllAsync(ApplyDefaultsToAllSyncsMessage message)
+    {
+        try
+        {
+            var config = _configService.Current;
+            var tasks = new List<Task>();
+            int updatedPairs = 0;
+            int updatedGroups = 0;
+
+            foreach (var pair in _pairManager.DirectPairs.Where(p => p.UserPair != null).ToList())
+            {
+                var permissions = pair.UserPair!.OwnPermissions;
+                var overrides = TryGetPairOverride(pair.UserData.UID);
+                if (!ApplyDefaults(ref permissions, config, overrides))
+                    continue;
+
+                updatedPairs++;
+                tasks.Add(_apiController.UserSetPairPermissions(new UserPermissionsDto(pair.UserData, permissions)));
+            }
+
+            var selfUser = new UserData(_apiController.UID);
+            foreach (var groupInfo in _pairManager.Groups.Values.ToList())
+            {
+                var permissions = groupInfo.GroupUserPermissions;
+                var overrides = TryGetGroupOverride(groupInfo.Group.GID);
+                if (!ApplyDefaults(ref permissions, config, overrides))
+                    continue;
+
+                updatedGroups++;
+                tasks.Add(_apiController.GroupChangeIndividualPermissionState(new GroupPairUserPermissionDto(groupInfo.Group, selfUser, permissions)));
+            }
+
+            if (tasks.Count > 0)
+            {
+                try
+                {
+                    await Task.WhenAll(tasks).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogWarning(ex, "Failed applying default sync settings to all pairs/groups");
+                }
+            }
+
+            var summary = BuildSummaryMessage(updatedPairs, updatedGroups);
+            var primary = BuildPrimaryMessage(message);
+            var combined = string.IsNullOrEmpty(primary) ? summary : string.Concat(primary, ' ', summary);
+            Mediator.Publish(new DualNotificationMessage("Préférences appliquées", combined, NotificationType.Info));
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Unexpected error while applying default sync settings to all pairs/groups");
+            Mediator.Publish(new DualNotificationMessage("Préférences appliquées", "Une erreur est survenue lors de l'application des paramètres par défaut.", NotificationType.Error));
+        }
+    }
+
+    private void ApplyDefaultsToAll(ApplyDefaultsToAllSyncsMessage message) => _ = ApplyDefaultsToAllAsync(message);
+
+    private static string? BuildPrimaryMessage(ApplyDefaultsToAllSyncsMessage message)
+    {
+        if (string.IsNullOrEmpty(message.Context) || message.Disabled == null)
+            return null;
+
+        var state = message.Disabled.Value ? "désactivée" : "activée";
+        return $"Synchronisation {message.Context} par défaut {state}.";
+    }
+
+    private static string BuildSummaryMessage(int pairs, int groups)
+    {
+        if (pairs == 0 && groups == 0)
+            return "Aucun pair ou syncshell n'avait besoin d'être modifié.";
+
+        if (pairs > 0 && groups > 0)
+            return $"Mise à jour de {pairs} pair(s) et {groups} syncshell(s).";
+
+        if (pairs > 0)
+            return $"Mise à jour de {pairs} pair(s).";
+
+        return $"Mise à jour de {groups} syncshell(s).";
+    }
+
+    private void OnPairOverrideChanged(PairSyncOverrideChanged message)
+    {
+        var overrides = _configService.Current.PairSyncOverrides ??= new(StringComparer.Ordinal);
+        var entry = overrides.TryGetValue(message.Uid, out var existing) ? existing : new SyncOverrideEntry();
+        bool changed = false;
+
+        if (message.DisableSounds.HasValue)
+        {
+            var val = message.DisableSounds.Value;
+            var defaultVal = _configService.Current.DefaultDisableSounds;
+            var newValue = val == defaultVal ? (bool?)null : val;
+            if (entry.DisableSounds != newValue)
+            {
+                entry.DisableSounds = newValue;
+                changed = true;
+            }
+        }
+
+        if (message.DisableAnimations.HasValue)
+        {
+            var val = message.DisableAnimations.Value;
+            var defaultVal = _configService.Current.DefaultDisableAnimations;
+            var newValue = val == defaultVal ? (bool?)null : val;
+            if (entry.DisableAnimations != newValue)
+            {
+                entry.DisableAnimations = newValue;
+                changed = true;
+            }
+        }
+
+        if (message.DisableVfx.HasValue)
+        {
+            var val = message.DisableVfx.Value;
+            var defaultVal = _configService.Current.DefaultDisableVfx;
+            var newValue = val == defaultVal ? (bool?)null : val;
+            if (entry.DisableVfx != newValue)
+            {
+                entry.DisableVfx = newValue;
+                changed = true;
+            }
+        }
+
+        if (!changed) return;
+
+        if (entry.IsEmpty)
+            overrides.Remove(message.Uid);
+        else
+            overrides[message.Uid] = entry;
+
+        _configService.Save();
+    }
+
+    private void OnGroupOverrideChanged(GroupSyncOverrideChanged message)
+    {
+        var overrides = _configService.Current.GroupSyncOverrides ??= new(StringComparer.Ordinal);
+        var entry = overrides.TryGetValue(message.Gid, out var existing) ? existing : new SyncOverrideEntry();
+        bool changed = false;
+
+        if (message.DisableSounds.HasValue)
+        {
+            var val = message.DisableSounds.Value;
+            var defaultVal = _configService.Current.DefaultDisableSounds;
+            var newValue = val == defaultVal ? (bool?)null : val;
+            if (entry.DisableSounds != newValue)
+            {
+                entry.DisableSounds = newValue;
+                changed = true;
+            }
+        }
+
+        if (message.DisableAnimations.HasValue)
+        {
+            var val = message.DisableAnimations.Value;
+            var defaultVal = _configService.Current.DefaultDisableAnimations;
+            var newValue = val == defaultVal ? (bool?)null : val;
+            if (entry.DisableAnimations != newValue)
+            {
+                entry.DisableAnimations = newValue;
+                changed = true;
+            }
+        }
+
+        if (message.DisableVfx.HasValue)
+        {
+            var val = message.DisableVfx.Value;
+            var defaultVal = _configService.Current.DefaultDisableVfx;
+            var newValue = val == defaultVal ? (bool?)null : val;
+            if (entry.DisableVfx != newValue)
+            {
+                entry.DisableVfx = newValue;
+                changed = true;
+            }
+        }
+
+        if (!changed) return;
+
+        if (entry.IsEmpty)
+            overrides.Remove(message.Gid);
+        else
+            overrides[message.Gid] = entry;
+
+        _configService.Save();
+    }
+
+    private SyncOverrideEntry? TryGetPairOverride(string uid)
+    {
+        var overrides = _configService.Current.PairSyncOverrides;
+        return overrides != null && overrides.TryGetValue(uid, out var entry) ? entry : null;
+    }
+
+    private SyncOverrideEntry? TryGetGroupOverride(string gid)
+    {
+        var overrides = _configService.Current.GroupSyncOverrides;
+        return overrides != null && overrides.TryGetValue(gid, out var entry) ? entry : null;
+    }
+
+    private static bool ApplyDefaults(ref UserPermissions permissions, MareConfig config, SyncOverrideEntry? overrides)
+    {
+        bool changed = false;
+        if (overrides?.DisableSounds is bool overrideSounds)
+        {
+            if (permissions.IsDisableSounds() != overrideSounds)
+            {
+                permissions.SetDisableSounds(overrideSounds);
+                changed = true;
+            }
+        }
+        else if (permissions.IsDisableSounds() != config.DefaultDisableSounds)
+        {
+            permissions.SetDisableSounds(config.DefaultDisableSounds);
+            changed = true;
+        }
+
+        if (overrides?.DisableAnimations is bool overrideAnims)
+        {
+            if (permissions.IsDisableAnimations() != overrideAnims)
+            {
+                permissions.SetDisableAnimations(overrideAnims);
+                changed = true;
+            }
+        }
+        else if (permissions.IsDisableAnimations() != config.DefaultDisableAnimations)
+        {
+            permissions.SetDisableAnimations(config.DefaultDisableAnimations);
+            changed = true;
+        }
+
+        if (overrides?.DisableVfx is bool overrideVfx)
+        {
+            if (permissions.IsDisableVFX() != overrideVfx)
+            {
+                permissions.SetDisableVFX(overrideVfx);
+                changed = true;
+            }
+        }
+        else if (permissions.IsDisableVFX() != config.DefaultDisableVfx)
+        {
+            permissions.SetDisableVFX(config.DefaultDisableVfx);
+            changed = true;
+        }
+
+        return changed;
+    }
+
+    private static bool ApplyDefaults(ref GroupUserPermissions permissions, MareConfig config, SyncOverrideEntry? overrides)
+    {
+        bool changed = false;
+        if (overrides?.DisableSounds is bool overrideSounds)
+        {
+            if (permissions.IsDisableSounds() != overrideSounds)
+            {
+                permissions.SetDisableSounds(overrideSounds);
+                changed = true;
+            }
+        }
+        else if (permissions.IsDisableSounds() != config.DefaultDisableSounds)
+        {
+            permissions.SetDisableSounds(config.DefaultDisableSounds);
+            changed = true;
+        }
+
+        if (overrides?.DisableAnimations is bool overrideAnims)
+        {
+            if (permissions.IsDisableAnimations() != overrideAnims)
+            {
+                permissions.SetDisableAnimations(overrideAnims);
+                changed = true;
+            }
+        }
+        else if (permissions.IsDisableAnimations() != config.DefaultDisableAnimations)
+        {
+            permissions.SetDisableAnimations(config.DefaultDisableAnimations);
+            changed = true;
+        }
+
+        if (overrides?.DisableVfx is bool overrideVfx)
+        {
+            if (permissions.IsDisableVFX() != overrideVfx)
+            {
+                permissions.SetDisableVFX(overrideVfx);
+                changed = true;
+            }
+        }
+        else if (permissions.IsDisableVFX() != config.DefaultDisableVfx)
+        {
+            permissions.SetDisableVFX(config.DefaultDisableVfx);
+            changed = true;
+        }
+
+        return changed;
+    }
+}

MareSynchronos/Services/TemporarySyncshellNotificationService.cs

@@ -0,0 +1,225 @@
+using System.Globalization;
+using System.Threading;
+using MareSynchronos.API.Dto.Group;
+using MareSynchronos.MareConfiguration.Models;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.WebAPI;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace MareSynchronos.Services;
+
+public sealed class TemporarySyncshellNotificationService : MediatorSubscriberBase, IHostedService
+{
+    private static readonly int[] NotificationThresholdMinutes = [30, 15, 5, 1];
+    private readonly ApiController _apiController;
+    private readonly PairManager _pairManager;
+    private readonly Lock _stateLock = new();
+    private readonly Dictionary<string, TrackedGroup> _trackedGroups = new(StringComparer.Ordinal);
+    private CancellationTokenSource? _loopCts;
+    private Task? _loopTask;
+
+    public TemporarySyncshellNotificationService(ILogger<TemporarySyncshellNotificationService> logger, MareMediator mediator, PairManager pairManager, ApiController apiController)
+        : base(logger, mediator)
+    {
+        _pairManager = pairManager;
+        _apiController = apiController;
+    }
+
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        _loopCts = new CancellationTokenSource();
+        Mediator.Subscribe<ConnectedMessage>(this, _ => ResetTrackedGroups());
+        Mediator.Subscribe<DisconnectedMessage>(this, _ => ResetTrackedGroups());
+        _loopTask = Task.Run(() => MonitorLoopAsync(_loopCts.Token), _loopCts.Token);
+        return Task.CompletedTask;
+    }
+
+    public async Task StopAsync(CancellationToken cancellationToken)
+    {
+        Mediator.UnsubscribeAll(this);
+        if (_loopCts == null)
+        {
+            return;
+        }
+
+        try
+        {
+            _loopCts.Cancel();
+            if (_loopTask != null)
+            {
+                await _loopTask.ConfigureAwait(false);
+            }
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        finally
+        {
+            _loopTask = null;
+            _loopCts.Dispose();
+            _loopCts = null;
+        }
+    }
+
+    private async Task MonitorLoopAsync(CancellationToken ct)
+    {
+        var delay = TimeSpan.FromSeconds(30);
+        while (!ct.IsCancellationRequested)
+        {
+            try
+            {
+                CheckGroups();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogDebug(ex, "Failed to check temporary syncshell expirations");
+            }
+
+            try
+            {
+                await Task.Delay(delay, ct).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+        }
+    }
+
+    private void CheckGroups()
+    {
+        var nowUtc = DateTime.UtcNow;
+        var groupsSnapshot = _pairManager.Groups.Values.ToList();
+        var notifications = new List<NotificationPayload>();
+        var expiredGroups = new List<GroupFullInfoDto>();
+        var seenTemporaryGids = new HashSet<string>(StringComparer.Ordinal);
+
+        using (var guard = _stateLock.EnterScope())
+        {
+            foreach (var group in groupsSnapshot)
+            {
+                if (!group.IsTemporary || group.ExpiresAt == null)
+                {
+                    continue;
+                }
+
+                if (string.IsNullOrEmpty(_apiController.UID) || !string.Equals(group.OwnerUID, _apiController.UID, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                var gid = group.Group.GID;
+                seenTemporaryGids.Add(gid);
+                var expiresAtUtc = NormalizeToUtc(group.ExpiresAt.Value);
+                var remaining = expiresAtUtc - nowUtc;
+
+                if (!_trackedGroups.TryGetValue(gid, out var state))
+                {
+                    state = new TrackedGroup(expiresAtUtc);
+                    _trackedGroups[gid] = state;
+                }
+                else if (state.ExpiresAtUtc != expiresAtUtc)
+                {
+                    state.UpdateExpiresAt(expiresAtUtc);
+                }
+
+                if (remaining <= TimeSpan.Zero)
+                {
+                    _trackedGroups.Remove(gid);
+                    expiredGroups.Add(group);
+                    continue;
+                }
+
+                if (!state.LastRemaining.HasValue)
+                {
+                    state.UpdateRemaining(remaining);
+                    continue;
+                }
+
+                var previousRemaining = state.LastRemaining.Value;
+
+                foreach (var thresholdMinutes in NotificationThresholdMinutes)
+                {
+                    var threshold = TimeSpan.FromMinutes(thresholdMinutes);
+                    if (previousRemaining > threshold && remaining <= threshold)
+                    {
+                        notifications.Add(new NotificationPayload(group, thresholdMinutes, expiresAtUtc));
+                    }
+                }
+
+                state.UpdateRemaining(remaining);
+            }
+
+            var toRemove = _trackedGroups.Keys.Where(k => !seenTemporaryGids.Contains(k)).ToList();
+            foreach (var gid in toRemove)
+            {
+                _trackedGroups.Remove(gid);
+            }
+        }
+
+        foreach (var expiredGroup in expiredGroups)
+        {
+            Logger.LogInformation("Temporary syncshell {gid} expired locally; removing", expiredGroup.Group.GID);
+            _pairManager.RemoveGroup(expiredGroup.Group);
+        }
+
+        foreach (var notification in notifications)
+        {
+            PublishNotification(notification.Group, notification.ThresholdMinutes, notification.ExpiresAtUtc);
+        }
+    }
+
+    private void PublishNotification(GroupFullInfoDto group, int thresholdMinutes, DateTime expiresAtUtc)
+    {
+        string displayName = string.IsNullOrWhiteSpace(group.GroupAlias) ? group.Group.GID : group.GroupAlias!;
+        string threshold = thresholdMinutes == 1 ? "1 minute" : $"{thresholdMinutes} minutes";
+        string expiresLocal = expiresAtUtc.ToLocalTime().ToString("t", CultureInfo.CurrentCulture);
+
+        string message = $"La Syncshell temporaire \"{displayName}\" sera supprimee dans {threshold} (a {expiresLocal}).";
+        Mediator.Publish(new NotificationMessage("Syncshell temporaire", message, NotificationType.Warning, TimeSpan.FromSeconds(6)));
+    }
+
+    private static DateTime NormalizeToUtc(DateTime expiresAt)
+    {
+        return expiresAt.Kind switch
+        {
+            DateTimeKind.Utc => expiresAt,
+            DateTimeKind.Local => expiresAt.ToUniversalTime(),
+            _ => DateTime.SpecifyKind(expiresAt, DateTimeKind.Utc)
+        };
+    }
+
+    private void ResetTrackedGroups()
+    {
+        using (var guard = _stateLock.EnterScope())
+        {
+            _trackedGroups.Clear();
+        }
+    }
+
+    private sealed class TrackedGroup
+    {
+        public TrackedGroup(DateTime expiresAtUtc)
+        {
+            ExpiresAtUtc = expiresAtUtc;
+        }
+
+        public DateTime ExpiresAtUtc { get; private set; }
+        public TimeSpan? LastRemaining { get; private set; }
+
+        public void UpdateExpiresAt(DateTime expiresAtUtc)
+        {
+            ExpiresAtUtc = expiresAtUtc;
+            LastRemaining = null;
+        }
+
+        public void UpdateRemaining(TimeSpan remaining)
+        {
+            LastRemaining = remaining;
+        }
+    }
+
+    private sealed record NotificationPayload(GroupFullInfoDto Group, int ThresholdMinutes, DateTime ExpiresAtUtc);
+}

MareSynchronos/Services/TypingIndicatorStateService.cs

@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.WebAPI;
+using Microsoft.Extensions.Logging;
+using MareSynchronos.API.Data;
+
+namespace MareSynchronos.Services;
+
+public sealed class TypingIndicatorStateService : IMediatorSubscriber, IDisposable
+{
+    private sealed record TypingEntry(UserData User, DateTime FirstSeen, DateTime LastUpdate);
+
+    private readonly ConcurrentDictionary<string, TypingEntry> _typingUsers = new(StringComparer.Ordinal);
+    private readonly ApiController _apiController;
+    private readonly ILogger<TypingIndicatorStateService> _logger;
+    private DateTime _selfTypingLast = DateTime.MinValue;
+    private DateTime _selfTypingStart = DateTime.MinValue;
+    private bool _selfTypingActive;
+
+    public TypingIndicatorStateService(ILogger<TypingIndicatorStateService> logger, MareMediator mediator, ApiController apiController)
+    {
+        _logger = logger;
+        _apiController = apiController;
+        Mediator = mediator;
+
+        mediator.Subscribe<UserTypingStateMessage>(this, OnTypingState);
+    }
+
+    public void Dispose()
+    {
+        Mediator.UnsubscribeAll(this);
+    }
+
+    public MareMediator Mediator { get; }
+
+    public void SetSelfTypingLocal(bool isTyping)
+    {
+        if (isTyping)
+        {
+            if (!_selfTypingActive)
+                _selfTypingStart = DateTime.UtcNow;
+            _selfTypingLast = DateTime.UtcNow;
+        }
+        else
+        {
+            _selfTypingStart = DateTime.MinValue;
+        }
+
+        _selfTypingActive = isTyping;
+    }
+
+    private void OnTypingState(UserTypingStateMessage msg)
+    {
+        var uid = msg.Typing.User.UID;
+        var now = DateTime.UtcNow;
+
+        if (string.Equals(uid, _apiController.UID, StringComparison.Ordinal))
+        {
+            _selfTypingActive = msg.Typing.IsTyping;
+            if (_selfTypingActive)
+            {
+                if (_selfTypingStart == DateTime.MinValue)
+                    _selfTypingStart = now;
+                _selfTypingLast = now;
+            }
+            else
+            {
+                _selfTypingStart = DateTime.MinValue;
+            }
+            _logger.LogInformation("Typing state self -> {state}", _selfTypingActive);
+        }
+        else if (msg.Typing.IsTyping)
+        {
+            _typingUsers.AddOrUpdate(uid,
+                _ => new TypingEntry(msg.Typing.User, now, now),
+                (_, existing) => new TypingEntry(msg.Typing.User, existing.FirstSeen, now));
+        }
+        else
+        {
+            _typingUsers.TryRemove(uid, out _);
+        }
+    }
+
+    public bool TryGetSelfTyping(TimeSpan maxAge, out DateTime startTyping, out DateTime lastTyping)
+    {
+        startTyping = _selfTypingStart;
+        lastTyping = _selfTypingLast;
+        if (!_selfTypingActive)
+            return false;
+
+        var now = DateTime.UtcNow;
+        if ((now - _selfTypingLast) >= maxAge)
+        {
+            _selfTypingActive = false;
+            _selfTypingStart = DateTime.MinValue;
+            return false;
+        }
+
+        return true;
+    }
+
+    public IReadOnlyDictionary<string, (UserData User, DateTime FirstSeen, DateTime LastUpdate)> GetActiveTypers(TimeSpan maxAge)
+    {
+        var now = DateTime.UtcNow;
+        foreach (var kvp in _typingUsers.ToArray())
+        {
+            if ((now - kvp.Value.LastUpdate) >= maxAge)
+            {
+                _typingUsers.TryRemove(kvp.Key, out _);
+            }
+        }
+
+        return _typingUsers.ToDictionary(k => k.Key, v => (v.Value.User, v.Value.FirstSeen, v.Value.LastUpdate), StringComparer.Ordinal);
+    }
+}

MareSynchronos/UI/AutoDetectUi.cs

@@ -0,0 +1,351 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Colors;
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Interface.Utility;
+using Dalamud.Interface.Utility.Raii;
+using Dalamud.Plugin.Services;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.Mediator;
+using Microsoft.Extensions.Logging;
+using System.Numerics;
+using System.Globalization;
+using System.Text;
+using MareSynchronos.Services;
+using MareSynchronos.Services.AutoDetect;
+using NotificationType = MareSynchronos.MareConfiguration.Models.NotificationType;
+
+namespace MareSynchronos.UI;
+
+public class AutoDetectUi : WindowMediatorSubscriberBase
+{
+    private readonly MareConfigService _configService;
+    private readonly DalamudUtilService _dalamud;
+    private readonly IObjectTable _objectTable;
+    private readonly AutoDetectRequestService _requestService;
+    private readonly NearbyPendingService _pendingService;
+    private readonly PairManager _pairManager;
+    private List<Services.Mediator.NearbyEntry> _entries = new();
+    private readonly HashSet<string> _acceptInFlight = new(StringComparer.Ordinal);
+
+    public AutoDetectUi(ILogger<AutoDetectUi> logger, MareMediator mediator,
+        MareConfigService configService, DalamudUtilService dalamudUtilService, IObjectTable objectTable,
+        AutoDetectRequestService requestService, NearbyPendingService pendingService, PairManager pairManager,
+        PerformanceCollectorService performanceCollectorService)
+        : base(logger, mediator, "AutoDetect", performanceCollectorService)
+    {
+        _configService = configService;
+        _dalamud = dalamudUtilService;
+        _objectTable = objectTable;
+        _requestService = requestService;
+        _pendingService = pendingService;
+        _pairManager = pairManager;
+
+        Flags |= ImGuiWindowFlags.NoScrollbar;
+        SizeConstraints = new WindowSizeConstraints()
+        {
+            MinimumSize = new Vector2(350, 220),
+            MaximumSize = new Vector2(600, 600),
+        };
+    }
+
+    public override bool DrawConditions()
+    {
+        return true;
+    }
+
+    protected override void DrawInternal()
+    {
+        using var idScope = ImRaii.PushId("autodetect-ui");
+
+        var incomingInvites = _pendingService.Pending.ToList();
+        var outgoingInvites = _requestService.GetPendingRequestsSnapshot();
+
+        Vector4 accent = UiSharedService.AccentColor;
+        if (accent.W <= 0f) accent = ImGuiColors.ParsedPurple;
+        Vector4 inactiveTab = new(accent.X * 0.45f, accent.Y * 0.45f, accent.Z * 0.45f, Math.Clamp(accent.W + 0.15f, 0f, 1f));
+        Vector4 hoverTab = UiSharedService.AccentHoverColor;
+
+        using var tabs = ImRaii.TabBar("AutoDetectTabs");
+        if (!tabs.Success) return;
+
+        var incomingCount = incomingInvites.Count;
+        DrawStyledTab($"Invitations ({incomingCount})", accent, inactiveTab, hoverTab, () =>
+        {
+            DrawInvitationsTab(incomingInvites, outgoingInvites);
+        });
+
+        DrawStyledTab("Proximité", accent, inactiveTab, hoverTab, DrawNearbyTab);
+
+        using (ImRaii.Disabled(true))
+        {
+            DrawStyledTab("Syncshell", accent, inactiveTab, hoverTab, () =>
+            {
+                UiSharedService.ColorTextWrapped("Disponible prochainement.", ImGuiColors.DalamudGrey3);
+            }, true);
+        }
+    }
+
+    private static void DrawStyledTab(string label, Vector4 accent, Vector4 inactive, Vector4 hover, Action draw, bool disabled = false)
+    {
+        var tabColor = disabled ? ImGuiColors.DalamudGrey3 : inactive;
+        var tabHover = disabled ? ImGuiColors.DalamudGrey3 : hover;
+        var tabActive = disabled ? ImGuiColors.DalamudGrey2 : accent;
+        using var baseColor = ImRaii.PushColor(ImGuiCol.Tab, tabColor);
+        using var hoverColor = ImRaii.PushColor(ImGuiCol.TabHovered, tabHover);
+        using var activeColor = ImRaii.PushColor(ImGuiCol.TabActive, tabActive);
+        using var activeText = ImRaii.PushColor(ImGuiCol.Text, disabled ? ImGuiColors.DalamudGrey2 : Vector4.One, false);
+        using var tab = ImRaii.TabItem(label);
+        if (tab.Success)
+        {
+            draw();
+        }
+    }
+
+    private void DrawInvitationsTab(List<KeyValuePair<string, string>> incomingInvites, IReadOnlyCollection<AutoDetectRequestService.PendingRequestInfo> outgoingInvites)
+    {
+        if (incomingInvites.Count == 0 && outgoingInvites.Count == 0)
+        {
+            UiSharedService.ColorTextWrapped("Aucune invitation en attente. Cette page regroupera les demandes reçues et celles que vous avez envoyées.", ImGuiColors.DalamudGrey3);
+            return;
+        }
+
+        if (incomingInvites.Count == 0)
+        {
+            UiSharedService.ColorTextWrapped("Vous n'avez aucune invitation de pair en attente pour le moment.", ImGuiColors.DalamudGrey3);
+        }
+
+        ImGuiHelpers.ScaledDummy(4);
+        float leftWidth = Math.Max(220f * ImGuiHelpers.GlobalScale, ImGui.CalcTextSize("Invitations reçues (00)").X + ImGui.GetStyle().FramePadding.X * 4f);
+        var avail = ImGui.GetContentRegionAvail();
+
+        ImGui.BeginChild("incoming-requests", new Vector2(leftWidth, avail.Y), true);
+        ImGui.TextColored(ImGuiColors.DalamudOrange, $"Invitations reçues ({incomingInvites.Count})");
+        ImGui.Separator();
+        if (incomingInvites.Count == 0)
+        {
+            ImGui.TextDisabled("Aucune invitation reçue.");
+        }
+        else
+        {
+            foreach (var (uid, name) in incomingInvites.OrderBy(k => k.Value, StringComparer.OrdinalIgnoreCase))
+            {
+                using var id = ImRaii.PushId(uid);
+                bool processing = _acceptInFlight.Contains(uid);
+                ImGui.TextUnformatted(name);
+                ImGui.TextDisabled(uid);
+                if (processing)
+                {
+                    ImGui.TextDisabled("Traitement en cours...");
+                }
+                else
+                {
+                    if (ImGui.Button("Accepter"))
+                    {
+                        TriggerAccept(uid);
+                    }
+                    ImGui.SameLine();
+                    if (ImGui.Button("Refuser"))
+                    {
+                        _pendingService.Remove(uid);
+                    }
+                }
+                ImGui.Separator();
+            }
+        }
+        ImGui.EndChild();
+
+        ImGui.SameLine();
+
+        ImGui.BeginChild("outgoing-requests", new Vector2(0, avail.Y), true);
+        ImGui.TextColored(ImGuiColors.DalamudOrange, $"Invitations envoyées ({outgoingInvites.Count})");
+        ImGui.Separator();
+        if (outgoingInvites.Count == 0)
+        {
+            ImGui.TextDisabled("Aucune invitation envoyée en attente.");
+            ImGui.EndChild();
+            return;
+        }
+
+        foreach (var info in outgoingInvites.OrderByDescending(i => i.SentAt))
+        {
+            using var id = ImRaii.PushId(info.Key);
+            ImGui.TextUnformatted(info.TargetDisplayName);
+            if (!string.IsNullOrEmpty(info.Uid))
+            {
+                ImGui.TextDisabled(info.Uid);
+            }
+
+            ImGui.TextDisabled($"Envoyée il y a {FormatDuration(DateTime.UtcNow - info.SentAt)}");
+            if (ImGui.Button("Retirer"))
+            {
+                _requestService.RemovePendingRequestByKey(info.Key);
+            }
+            UiSharedService.AttachToolTip("Retire uniquement cette entrée locale de suivi.");
+            ImGui.Separator();
+        }
+
+        ImGui.EndChild();
+    }
+
+    private void DrawNearbyTab()
+    {
+        if (!_configService.Current.EnableAutoDetectDiscovery)
+        {
+            UiSharedService.ColorTextWrapped("AutoDetect est désactivé. Activez-le dans les paramètres pour détecter les utilisateurs Umbra à proximité.", ImGuiColors.DalamudYellow);
+            ImGuiHelpers.ScaledDummy(6);
+        }
+
+        int maxDist = Math.Clamp(_configService.Current.AutoDetectMaxDistanceMeters, 5, 100);
+        ImGui.AlignTextToFramePadding();
+        ImGui.TextUnformatted("Max distance (m)");
+        ImGui.SameLine();
+        ImGui.SetNextItemWidth(120 * ImGuiHelpers.GlobalScale);
+        if (ImGui.SliderInt("##autodetect-dist", ref maxDist, 5, 100))
+        {
+            _configService.Current.AutoDetectMaxDistanceMeters = maxDist;
+            _configService.Save();
+        }
+
+        ImGuiHelpers.ScaledDummy(6);
+
+        // Table header
+        if (ImGui.BeginTable("autodetect-nearby", 5, ImGuiTableFlags.SizingStretchProp))
+        {
+            ImGui.TableSetupColumn("Name");
+            ImGui.TableSetupColumn("World");
+            ImGui.TableSetupColumn("Distance");
+            ImGui.TableSetupColumn("Status");
+            ImGui.TableSetupColumn("Action");
+            ImGui.TableHeadersRow();
+
+            var data = _entries.Count > 0 ? _entries.Where(e => e.IsMatch).ToList() : new List<Services.Mediator.NearbyEntry>();
+            foreach (var e in data)
+            {
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(e.Name);
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(e.WorldId == 0 ? "-" : (_dalamud.WorldData.Value.TryGetValue(e.WorldId, out var w) ? w : e.WorldId.ToString()));
+                ImGui.TableNextColumn();
+                ImGui.TextUnformatted(float.IsNaN(e.Distance) ? "-" : $"{e.Distance:0.0} m");
+                ImGui.TableNextColumn();
+                bool alreadyPaired = IsAlreadyPairedByUidOrAlias(e);
+                string status = alreadyPaired ? "Paired" : (string.IsNullOrEmpty(e.Token) ? "Requests disabled" : "On Umbra");
+                ImGui.TextUnformatted(status);
+                ImGui.TableNextColumn();
+                using (ImRaii.Disabled(alreadyPaired || string.IsNullOrEmpty(e.Token)))
+                {
+                    if (alreadyPaired)
+                    {
+                        ImGui.Button($"Already sync##{e.Name}");
+                    }
+                    else if (string.IsNullOrEmpty(e.Token))
+                    {
+                        ImGui.Button($"Requests disabled##{e.Name}");
+                    }
+                    else if (ImGui.Button($"Send request##{e.Name}"))
+                    {
+                        _ = _requestService.SendRequestAsync(e.Token!, e.Uid, e.DisplayName);
+                    }
+                }
+            }
+
+            ImGui.EndTable();
+        }
+    }
+
+    public override void OnOpen()
+    {
+        base.OnOpen();
+        Mediator.Subscribe<Services.Mediator.DiscoveryListUpdated>(this, OnDiscoveryUpdated);
+    }
+
+    public override void OnClose()
+    {
+        Mediator.Unsubscribe<Services.Mediator.DiscoveryListUpdated>(this);
+        base.OnClose();
+    }
+
+    private void OnDiscoveryUpdated(Services.Mediator.DiscoveryListUpdated msg)
+    {
+        _entries = msg.Entries;
+    }
+
+    private bool IsAlreadyPairedByUidOrAlias(Services.Mediator.NearbyEntry e)
+    {
+        try
+        {
+            // 1) Match by UID when available (authoritative)
+            if (!string.IsNullOrEmpty(e.Uid))
+            {
+                foreach (var p in _pairManager.DirectPairs)
+                {
+                    if (string.Equals(p.UserData.UID, e.Uid, StringComparison.Ordinal))
+                        return true;
+                }
+            }
+            var key = NormalizeKey(e.DisplayName ?? e.Name);
+            if (string.IsNullOrEmpty(key)) return false;
+            foreach (var p in _pairManager.DirectPairs)
+            {
+                if (NormalizeKey(p.UserData.AliasOrUID) == key) return true;
+                if (!string.IsNullOrEmpty(p.UserData.Alias) && NormalizeKey(p.UserData.Alias!) == key) return true;
+            }
+        }
+        catch
+        {
+        }
+        return false;
+    }
+
+    private static string NormalizeKey(string? input)
+    {
+        if (string.IsNullOrWhiteSpace(input)) return string.Empty;
+        var formD = input.Normalize(NormalizationForm.FormD);
+        var sb = new StringBuilder(formD.Length);
+        foreach (var ch in formD)
+        {
+            var cat = CharUnicodeInfo.GetUnicodeCategory(ch);
+            if (cat != UnicodeCategory.NonSpacingMark)
+                sb.Append(char.ToLowerInvariant(ch));
+        }
+        return sb.ToString();
+    }
+
+    private void TriggerAccept(string uid)
+    {
+        if (!_acceptInFlight.Add(uid)) return;
+
+        Task.Run(async () =>
+        {
+            try
+            {
+                bool ok = await _pendingService.AcceptAsync(uid).ConfigureAwait(false);
+                if (!ok)
+                {
+                    Mediator.Publish(new NotificationMessage("AutoDetect", $"Impossible d'accepter l'invitation {uid}.", NotificationType.Warning, TimeSpan.FromSeconds(5)));
+                }
+            }
+            finally
+            {
+                _acceptInFlight.Remove(uid);
+            }
+        });
+    }
+
+    private static string FormatDuration(TimeSpan span)
+    {
+        if (span.TotalMinutes >= 1)
+        {
+            var minutes = Math.Max(1, (int)Math.Round(span.TotalMinutes));
+            return minutes == 1 ? "1 minute" : $"{minutes} minutes";
+        }
+
+        var seconds = Math.Max(1, (int)Math.Round(span.TotalSeconds));
+        return seconds == 1 ? "1 seconde" : $"{seconds} secondes";
+    }
+}

MareSynchronos/UI/ChangelogUi.cs

@@ -0,0 +1,249 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Reflection;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility.Raii;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.Services;
+using MareSynchronos.Services.Mediator;
+using Microsoft.Extensions.Logging;
+
+namespace MareSynchronos.UI;
+
+public sealed class ChangelogUi : WindowMediatorSubscriberBase
+{
+    private const int AlwaysExpandedEntryCount = 2;
+
+    private readonly MareConfigService _configService;
+    private readonly UiSharedService _uiShared;
+    private readonly Version _currentVersion;
+    private readonly string _currentVersionLabel;
+    private readonly IReadOnlyList<ChangelogEntry> _entries;
+
+    private bool _showAllEntries;
+    private bool _hasAcknowledgedVersion;
+
+    public ChangelogUi(ILogger<ChangelogUi> logger, UiSharedService uiShared, MareConfigService configService,
+        MareMediator mediator, PerformanceCollectorService performanceCollectorService)
+        : base(logger, mediator, "Umbra Sync - Notes de version", performanceCollectorService)
+    {
+        _uiShared = uiShared;
+        _configService = configService;
+        _currentVersion = Assembly.GetExecutingAssembly().GetName().Version ?? new Version(0, 0, 0, 0);
+        _currentVersionLabel = _currentVersion.ToString();
+        _entries = BuildEntries();
+        _hasAcknowledgedVersion = string.Equals(_configService.Current.LastChangelogVersionSeen, _currentVersionLabel, StringComparison.Ordinal);
+
+        RespectCloseHotkey = true;
+        SizeConstraints = new()
+        {
+            MinimumSize = new(520, 360),
+            MaximumSize = new(900, 1200)
+        };
+        Flags |= ImGuiWindowFlags.NoResize;
+        ShowCloseButton = true;
+
+        if (!string.Equals(_configService.Current.LastChangelogVersionSeen, _currentVersionLabel, StringComparison.Ordinal))
+        {
+            IsOpen = true;
+        }
+    }
+
+    public override void OnClose()
+    {
+        MarkCurrentVersionAsReadIfNeeded();
+        base.OnClose();
+    }
+
+    protected override void DrawInternal()
+    {
+        _ = _uiShared.DrawOtherPluginState();
+
+        DrawHeader();
+        DrawEntries();
+        DrawFooter();
+    }
+
+    private void DrawHeader()
+    {
+        using (_uiShared.UidFont.Push())
+        {
+            ImGui.TextUnformatted("Notes de version");
+        }
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, $"Version chargée : {_currentVersionLabel}");
+        ImGui.Separator();
+    }
+
+    private void DrawEntries()
+    {
+        bool expandedOldVersions = false;
+        for (int index = 0; index < _entries.Count; index++)
+        {
+            var entry = _entries[index];
+            if (!_showAllEntries && index >= AlwaysExpandedEntryCount)
+            {
+                if (!expandedOldVersions)
+                {
+                    expandedOldVersions = ImGui.CollapsingHeader("Historique complet");
+                }
+
+                if (!expandedOldVersions)
+                {
+                    continue;
+                }
+            }
+
+            DrawEntry(entry);
+        }
+    }
+
+    private void DrawEntry(ChangelogEntry entry)
+    {
+        using (ImRaii.PushId(entry.VersionLabel))
+        {
+            ImGui.Spacing();
+            UiSharedService.ColorText(entry.VersionLabel, entry.Version == _currentVersion
+                ? ImGuiColors.HealerGreen
+                : ImGuiColors.DalamudWhite);
+
+            ImGui.Spacing();
+
+            foreach (var line in entry.Lines)
+            {
+                DrawLine(line);
+            }
+
+            ImGui.Spacing();
+            ImGui.Separator();
+        }
+    }
+
+    private static void DrawLine(ChangelogLine line)
+    {
+        using var indent = line.IndentLevel > 0 ? ImRaii.PushIndent(line.IndentLevel) : null;
+        if (line.Color != null)
+        {
+            ImGui.TextColored(line.Color.Value, $"- {line.Text}");
+        }
+        else
+        {
+            ImGui.TextUnformatted($"- {line.Text}");
+        }
+    }
+
+    private void DrawFooter()
+    {
+        ImGui.Spacing();
+        if (!_showAllEntries && _entries.Count > AlwaysExpandedEntryCount)
+        {
+            if (ImGui.Button("Tout afficher"))
+            {
+                _showAllEntries = true;
+            }
+
+            ImGui.SameLine();
+        }
+
+        if (ImGui.Button("Marquer comme lu"))
+        {
+            MarkCurrentVersionAsReadIfNeeded();
+            IsOpen = false;
+        }
+    }
+
+    private void MarkCurrentVersionAsReadIfNeeded()
+    {
+        if (_hasAcknowledgedVersion)
+            return;
+
+        _configService.Current.LastChangelogVersionSeen = _currentVersionLabel;
+        _configService.Save();
+        _hasAcknowledgedVersion = true;
+    }
+
+    private static IReadOnlyList<ChangelogEntry> BuildEntries()
+    {
+        return new List<ChangelogEntry>
+        {
+                new(new Version(0, 1, 9, 6), "0.1.9.6", new List<ChangelogLine>
+            {
+                new("Possibilité de désactiver l'alerte self-analysis (Settings => Performance)."),
+            }),
+            new(new Version(0, 1, 9, 5), "0.1.9.5", new List<ChangelogLine>
+            {
+                new("Fix l'affichage de la bulle dans la liste du groupe."),
+                new("Amélioration de l'ajout des utilisateurs via le bouton +."),
+                new("Possibilité de mettre en pause individuellement des utilisateurs d'une syncshell."),
+                new("Amélioration de la stabilité du plugin en cas de petite connexion / petite configuration."),
+                new("Divers fix de l'interface."),
+            }),
+            new(new Version(0, 1, 9, 4), "0.1.9.4", new List<ChangelogLine>
+            {
+                new("Réécriture complète de la bulle de frappe avec la possibilité de choisir la taille de la bulle."),
+                new("Désactivation de l'AutoDetect en zone instanciée."),
+                new("Réécriture interface AutoDetect pour acceuillir les invitations en attente et préparer les synchsells publiques."),
+                new("Amélioration de la compréhension des activations / désactivations des préférences de synchronisation par défaut."),
+                new("Mise en avant du Self Analyse avec une alerte lorsqu'un seuil de donnée a été atteint."),
+                new("Ajout de l'alerte de la non-compatibilité du plugin Chat2."),
+                new("Divers fix de l'interface."),
+            }),
+            new(new Version(0, 1, 9, 3), "0.1.9.3", new List<ChangelogLine>
+            {
+                new("Correctif de l'affichage de la bulle de frappe quand l'interface est à + de 100%."),
+            }),
+            new(new Version(0, 1, 9, 2), "0.1.9.2", new List<ChangelogLine>
+            {
+                new("Correctif de l'affichage de la bulle de frappe."),
+            }),
+            new(new Version(0, 1, 9, 1), "0.1.9.1", new List<ChangelogLine>
+            {
+                new("Début correctif pour la bulle de frappe."),
+                new("Les bascules de synchronisation n'affichent plus qu'une seule notification résumée."),
+
+            }),
+            new(new Version(0, 1, 9, 0), "0.1.9.0", new List<ChangelogLine>
+            {
+                new("Il est désormais possible de configurer par défaut nos choix de synchronisation (VFX, Music, Animation)."),
+                new("La catégorie 'En attente' ne s'affiche uniquement que si une invitation est en attente"),
+                new("(EN PRÉ VERSION) Il est désormais possible de voir quand une personne appairée est en train d'écrire avec une bulle qui s'affiche."),
+                new("(EN PRÉ VERSION) La bulle de frappe s'affiche également sur votre propre plaque de nom lorsque vous écrivez."),
+                new("Les bascules de synchronisation n'affichent plus qu'une seule notification résumée."),
+                new("Correctif : Désormais, les invitation entrantes ne s'affichent qu'une seule fois au lieu de deux."),
+            }),
+            new(new Version(0, 1, 8, 2), "0.1.8.2", new List<ChangelogLine>
+            {
+                new("Détection Nearby : la liste rapide ne montre plus que les joueurs réellement invitables."),
+                new("Sont filtrés automatiquement les personnes refusées ou déjà appairées."),
+                new("Invitations Nearby : anti-spam de 5 minutes par personne, blocage 15 minutes après trois refus."),
+                new("Affichage : Correction de l'affichage des notes par défaut plutôt que de l'ID si disponible."),
+                new("Les notifications de blocage sont envoyées directement dans le tchat."),
+                new("Overlay DTR : affiche le nombre d'invitations Nearby disponibles dans le titre et l'infobulle."),
+                new("Poses Nearby : le filtre re-fonctionne avec vos notes locales pour retrouver les entrées correspondantes."),
+            }),
+            new(new Version(0, 1, 8, 1), "0.1.8.1", new List<ChangelogLine>
+            {
+                new("Correctif 'Vu sous' : l'infobulle affiche désormais le dernier personnage observé."),
+                new("Invitations AutoDetect : triées en tête de liste pour mieux les repérer."),
+                new("Invitations AutoDetect : conservées entre les redémarrages du plugin ou du jeu."),
+                new("Barre de statut serveur : couleur violette adoptée par défaut."),
+            }),
+            new(new Version(0, 1, 8, 0), "0.1.8.0", new List<ChangelogLine>
+            {
+                new("AutoDetect : détection automatique des joueurs Umbra autour de vous et propositions d'appairage."),
+                new("AutoDetect : désactivé par défaut pour préserver la confidentialité.", 1, ImGuiColors.DalamudGrey),
+                new("AutoDetect : activez-le dans 'Transfers' avec les options Nearby detection et Allow pair requests.", 1, ImGuiColors.DalamudGrey),
+                new("Syncshell temporaire : durée configurable de 1 h à 7 jours, expiration automatique."),
+                new("Syncshell permanente : possibilité de nommer et d'organiser vos groupes sur la durée."),
+                new("Interface : palette UmbraSync harmonisée et menus allégés pour l'usage RP."),
+            }),
+        };
+    }
+
+    private readonly record struct ChangelogEntry(Version Version, string VersionLabel, IReadOnlyList<ChangelogLine> Lines);
+
+    private readonly record struct ChangelogLine(string Text, int IndentLevel = 0, System.Numerics.Vector4? Color = null);
+}

MareSynchronos/UI/CharaDataHubUi.GposeTogether.cs

@@ -15,14 +15,14 @@ internal sealed partial class CharaDataHubUi
         if (!_charaDataManager.BrioAvailable)
         {
             ImGuiHelpers.ScaledDummy(5);
-            UiSharedService.DrawGroupedCenteredColorText("BRIO IS MANDATORY FOR GPOSE TOGETHER.", ImGuiColors.DalamudRed);
+            UiSharedService.DrawGroupedCenteredColorText("BRIO IS MANDATORY FOR GPOSE TOGETHER.", UiSharedService.AccentColor);
             ImGuiHelpers.ScaledDummy(5);
         }
 
         if (!_uiSharedService.ApiController.IsConnected)
         {
             ImGuiHelpers.ScaledDummy(5);
-            UiSharedService.DrawGroupedCenteredColorText("CANNOT USE GPOSE TOGETHER WHILE DISCONNECTED FROM THE SERVER.", ImGuiColors.DalamudRed);
+            UiSharedService.DrawGroupedCenteredColorText("CANNOT USE GPOSE TOGETHER WHILE DISCONNECTED FROM THE SERVER.", UiSharedService.AccentColor);
             ImGuiHelpers.ScaledDummy(5);
         }
 
@@ -165,7 +165,7 @@ internal sealed partial class CharaDataHubUi
             UiSharedService.AttachToolTip(user.WorldDataDescriptor + UiSharedService.TooltipSeparator);
 
             ImGui.SameLine();
-            _uiSharedService.IconText(FontAwesomeIcon.Map, sameMapAndServer.SameMap ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed);
+            _uiSharedService.IconText(FontAwesomeIcon.Map, sameMapAndServer.SameMap ? ImGuiColors.ParsedGreen : UiSharedService.AccentColor);
             if (ImGui.IsItemClicked(ImGuiMouseButton.Left) && user.WorldData != null)
             {
                 _dalamudUtilService.SetMarkerAndOpenMap(new(user.WorldData.Value.PositionX, user.WorldData.Value.PositionY, user.WorldData.Value.PositionZ), user.Map);
@@ -175,12 +175,12 @@ internal sealed partial class CharaDataHubUi
                 + "Note: For GPose synchronization to work properly, you must be on the same map.");
 
             ImGui.SameLine();
-            _uiSharedService.IconText(FontAwesomeIcon.Globe, sameMapAndServer.SameServer ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed);
+            _uiSharedService.IconText(FontAwesomeIcon.Globe, sameMapAndServer.SameServer ? ImGuiColors.ParsedGreen : UiSharedService.AccentColor);
             UiSharedService.AttachToolTip((sameMapAndServer.SameMap ? "You are on the same server." : "You are not on the same server.") + UiSharedService.TooltipSeparator
                 + "Note: GPose synchronization is not dependent on the current server, but you will have to spawn a character for the other lobby users.");
 
             ImGui.SameLine();
-            _uiSharedService.IconText(FontAwesomeIcon.Running, sameMapAndServer.SameEverything ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed);
+            _uiSharedService.IconText(FontAwesomeIcon.Running, sameMapAndServer.SameEverything ? ImGuiColors.ParsedGreen : UiSharedService.AccentColor);
             UiSharedService.AttachToolTip(sameMapAndServer.SameEverything ? "You are in the same instanced area." : "You are not the same instanced area." + UiSharedService.TooltipSeparator +
                 "Note: Users not in your instance, but on the same map, will be drawn as floating wisps." + Environment.NewLine
                 + "Note: GPose synchronization is not dependent on the current instance, but you will have to spawn a character for the other lobby users.");
@@ -217,7 +217,7 @@ internal sealed partial class CharaDataHubUi
                 if (_uiSharedService.IsInGpose && user.Address == nint.Zero)
                 {
                     ImGui.SameLine();
-                    _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, ImGuiColors.DalamudRed);
+                    _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, UiSharedService.AccentColor);
                     UiSharedService.AttachToolTip("No valid character assigned for this user. Pose data will not be applied.");
                 }
             }

MareSynchronos/UI/CharaDataHubUi.McdOnline.cs

@@ -45,7 +45,7 @@ internal sealed partial class CharaDataHubUi
                 if (canUpdate)
                 {
                     ImGui.AlignTextToFramePadding();
-                    UiSharedService.ColorTextWrapped("Warning: You have unsaved changes!", ImGuiColors.DalamudRed);
+                    UiSharedService.ColorTextWrapped("Warning: You have unsaved changes!", UiSharedService.AccentColor);
                     ImGui.SameLine();
                     using (ImRaii.Disabled(_charaDataManager.CharaUpdateTask != null && !_charaDataManager.CharaUpdateTask.IsCompleted))
                     {
@@ -216,7 +216,7 @@ internal sealed partial class CharaDataHubUi
             }
             else
             {
-                UiSharedService.ColorTextWrapped($"{dataDto.MissingFiles.DistinctBy(k => k.HashOrFileSwap).Count()} files to download this character data are missing on the server", ImGuiColors.DalamudRed);
+                UiSharedService.ColorTextWrapped($"{dataDto.MissingFiles.DistinctBy(k => k.HashOrFileSwap).Count()} files to download this character data are missing on the server", UiSharedService.AccentColor);
                 ImGui.NewLine();
                 ImGui.SameLine(pos);
                 if (_uiSharedService.IconTextButton(FontAwesomeIcon.ArrowCircleUp, "Attempt to upload missing files and restore Character Data"))
@@ -401,7 +401,7 @@ internal sealed partial class CharaDataHubUi
         else if (!_charaDataManager.BrioAvailable)
         {
             ImGuiHelpers.ScaledDummy(5);
-            UiSharedService.DrawGroupedCenteredColorText("To attach pose and world data Brio requires to be installed.", ImGuiColors.DalamudRed);
+            UiSharedService.DrawGroupedCenteredColorText("To attach pose and world data Brio requires to be installed.", UiSharedService.AccentColor);
             ImGuiHelpers.ScaledDummy(5);
         }
 
@@ -685,7 +685,7 @@ internal sealed partial class CharaDataHubUi
         }
         else if (_charaDataManager.DataCreationTask != null && _charaDataManager.DataCreationTask.IsCompleted)
         {
-            var color = _charaDataManager.DataCreationTask.Result.Success ? ImGuiColors.HealerGreen : ImGuiColors.DalamudRed;
+            var color = _charaDataManager.DataCreationTask.Result.Success ? ImGuiColors.HealerGreen : UiSharedService.AccentColor;
             UiSharedService.ColorTextWrapped(_charaDataManager.DataCreationTask.Result.Output, color);
         }
 

MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs

@@ -57,6 +57,14 @@ internal partial class CharaDataHubUi
                 _configService.Save();
             }
             _uiSharedService.DrawHelpText("Draw floating wisps where other's poses are in the world.");
+            int maxWisps = _configService.Current.NearbyMaxWisps;
+            ImGui.SetNextItemWidth(140);
+            if (ImGui.SliderInt("Maximum wisps", ref maxWisps, 0, 200))
+            {
+                _configService.Current.NearbyMaxWisps = maxWisps;
+                _configService.Save();
+            }
+            _uiSharedService.DrawHelpText("Limit how many wisps are active at once. Set to 0 to disable wisps even when enabled above.");
             int poseDetectionDistance = _configService.Current.NearbyDistanceFilter;
             ImGui.SetNextItemWidth(100);
             if (ImGui.SliderInt("Detection Distance", ref poseDetectionDistance, 5, 1000))

MareSynchronos/UI/CharaDataHubUi.cs

@@ -170,7 +170,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
         if (!_charaDataManager.BrioAvailable)
         {
             ImGuiHelpers.ScaledDummy(3);
-            UiSharedService.DrawGroupedCenteredColorText("To utilize any features related to posing or spawning characters you require to have Brio installed.", ImGuiColors.DalamudRed);
+            UiSharedService.DrawGroupedCenteredColorText("To utilize any features related to posing or spawning characters you require to have Brio installed.", UiSharedService.AccentColor);
             UiSharedService.DistanceSeparator();
         }
 
@@ -194,7 +194,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
             }
             if (_charaDataManager.DataApplicationTask != null)
             {
-                UiSharedService.ColorTextWrapped("WARNING: During the data application avoid interacting with this actor to prevent potential crashes.", ImGuiColors.DalamudRed);
+                UiSharedService.ColorTextWrapped("WARNING: During the data application avoid interacting with this actor to prevent potential crashes.", UiSharedService.AccentColor);
                 ImGuiHelpers.ScaledDummy(5);
                 ImGui.Separator();
             }
@@ -648,7 +648,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
                 }
                 if ((_charaDataManager.DownloadMetaInfoTask?.IsCompleted ?? false) && !_charaDataManager.DownloadMetaInfoTask.Result.Success)
                 {
-                    UiSharedService.ColorTextWrapped(_charaDataManager.DownloadMetaInfoTask.Result.Result, ImGuiColors.DalamudRed);
+                    UiSharedService.ColorTextWrapped(_charaDataManager.DownloadMetaInfoTask.Result.Result, UiSharedService.AccentColor);
                 }
 
                 using (ImRaii.Disabled(_charaDataManager.LastDownloadedMetaInfo == null))
@@ -848,7 +848,7 @@ internal sealed partial class CharaDataHubUi : WindowMediatorSubscriberBase
                     if ((_charaDataManager.LoadedMcdfHeader?.IsFaulted ?? false) || (_charaDataManager.McdfApplicationTask?.IsFaulted ?? false))
                     {
                         UiSharedService.ColorTextWrapped("Failure to read MCDF file. MCDF file is possibly corrupt. Re-export the MCDF file and try again.",
-                            ImGuiColors.DalamudRed);
+                            UiSharedService.AccentColor);
                         UiSharedService.ColorTextWrapped("Note: if this is your MCDF, try redrawing yourself, wait and re-export the file. " +
                             "If you received it from someone else have them do the same.", ImGuiColors.DalamudYellow);
                     }

MareSynchronos/UI/CompactUI.cs

@@ -7,11 +7,13 @@ using Dalamud.Utility;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.API.Dto.User;
 using MareSynchronos.MareConfiguration;
+using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
+using MareSynchronos.Services.AutoDetect;
 using MareSynchronos.UI.Components;
 using MareSynchronos.UI.Handlers;
 using MareSynchronos.WebAPI;
@@ -24,6 +26,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Numerics;
 using System.Reflection;
+using System.Linq;
 
 namespace MareSynchronos.UI;
 
@@ -43,6 +46,9 @@ public class CompactUi : WindowMediatorSubscriberBase
     private readonly ServerConfigurationManager _serverManager;
     private readonly Stopwatch _timeout = new();
     private readonly CharaDataManager _charaDataManager;
+    private readonly NearbyPendingService _nearbyPending;
+    private readonly AutoDetectRequestService _autoDetectRequestService;
+    private readonly CharacterAnalyzer _characterAnalyzer;
     private readonly UidDisplayHandler _uidDisplayHandler;
     private readonly UiSharedService _uiSharedService;
     private bool _buttonState;
@@ -56,11 +62,18 @@ public class CompactUi : WindowMediatorSubscriberBase
     private bool _showModalForUserAddition;
     private bool _showSyncShells;
     private bool _wasOpen;
+    private bool _nearbyOpen = true;
+    private List<Services.Mediator.NearbyEntry> _nearbyEntries = new();
+    private const long SelfAnalysisSizeWarningThreshold = 300L * 1024 * 1024;
+    private const long SelfAnalysisTriangleWarningThreshold = 150_000;
 
     public CompactUi(ILogger<CompactUi> logger, UiSharedService uiShared, MareConfigService configService, ApiController apiController, PairManager pairManager, ChatService chatService,
         ServerConfigurationManager serverManager, MareMediator mediator, FileUploadManager fileTransferManager, UidDisplayHandler uidDisplayHandler, CharaDataManager charaDataManager,
+        NearbyPendingService nearbyPendingService,
+        AutoDetectRequestService autoDetectRequestService,
+        CharacterAnalyzer characterAnalyzer,
         PerformanceCollectorService performanceCollectorService)
-        : base(logger, mediator, "###UmbraSyncSyncMainUI", performanceCollectorService)
+        : base(logger, mediator, "###UmbraSyncMainUI", performanceCollectorService)
     {
         _uiSharedService = uiShared;
         _configService = configService;
@@ -70,9 +83,12 @@ public class CompactUi : WindowMediatorSubscriberBase
         _fileTransferManager = fileTransferManager;
         _uidDisplayHandler = uidDisplayHandler;
         _charaDataManager = charaDataManager;
+        _nearbyPending = nearbyPendingService;
+        _autoDetectRequestService = autoDetectRequestService;
+        _characterAnalyzer = characterAnalyzer;
         var tagHandler = new TagHandler(_serverManager);
 
-        _groupPanel = new(this, uiShared, _pairManager, chatService, uidDisplayHandler, _configService, _serverManager, _charaDataManager);
+        _groupPanel = new(this, uiShared, _pairManager, chatService, uidDisplayHandler, _configService, _serverManager, _charaDataManager, _autoDetectRequestService);
         _selectGroupForPairUi = new(tagHandler, uidDisplayHandler, _uiSharedService);
         _selectPairsForGroupUi = new(tagHandler, uidDisplayHandler);
         _pairGroupsUi = new(configService, tagHandler, uidDisplayHandler, apiController, _selectPairsForGroupUi, _uiSharedService);
@@ -80,11 +96,11 @@ public class CompactUi : WindowMediatorSubscriberBase
 #if DEBUG
         string dev = "Dev Build";
         var ver = Assembly.GetExecutingAssembly().GetName().Version!;
-        WindowName = $"UmbraSync {dev} ({ver.Major}.{ver.Minor}.{ver.Build})###UmbraSyncSyncMainUIDev";
+        WindowName = $"UmbraSync {dev} ({ver.Major}.{ver.Minor}.{ver.Build})###UmbraSyncMainUIDev";
         Toggle();
 #else
         var ver = Assembly.GetExecutingAssembly().GetName().Version!;
-        WindowName = "UmbraSync " + ver.Major + "." + ver.Minor + "." + ver.Build + "###UmbraSyncSyncMainUI";
+        WindowName = "UmbraSync " + ver.Major + "." + ver.Minor + "." + ver.Build + "###UmbracSyncMainUI";
 #endif
         Mediator.Subscribe<SwitchToMainUiMessage>(this, (_) => IsOpen = true);
         Mediator.Subscribe<SwitchToIntroUiMessage>(this, (_) => IsOpen = false);
@@ -92,6 +108,20 @@ public class CompactUi : WindowMediatorSubscriberBase
         Mediator.Subscribe<CutsceneEndMessage>(this, (_) => UiSharedService_GposeEnd());
         Mediator.Subscribe<DownloadStartedMessage>(this, (msg) => _currentDownloads[msg.DownloadId] = msg.DownloadStatus);
         Mediator.Subscribe<DownloadFinishedMessage>(this, (msg) => _currentDownloads.TryRemove(msg.DownloadId, out _));
+        Mediator.Subscribe<DiscoveryListUpdated>(this, (msg) =>
+        {
+            _nearbyEntries = msg.Entries;
+            // Update last-seen character names for matched entries
+            foreach (var e in _nearbyEntries.Where(x => x.IsMatch))
+            {
+                var uid = e.Uid;
+                var lastSeen = e.DisplayName ?? e.Name;
+                if (!string.IsNullOrEmpty(uid) && !string.IsNullOrEmpty(lastSeen))
+                {
+                    _serverManager.SetNameForUid(uid, lastSeen);
+                }
+            }
+        });
 
         Flags |= ImGuiWindowFlags.NoDocking;
 
@@ -104,7 +134,15 @@ public class CompactUi : WindowMediatorSubscriberBase
 
     protected override void DrawInternal()
     {
-        UiSharedService.AccentColor = new Vector4(0.2f, 0.6f, 1f, 1f); // custom blue
+        UiSharedService.AccentColor = new Vector4(0x8D / 255f, 0x37 / 255f, 0xC0 / 255f, 1f);
+        UiSharedService.AccentHoverColor = new Vector4(0x3A / 255f, 0x15 / 255f, 0x50 / 255f, 1f);
+        UiSharedService.AccentActiveColor = UiSharedService.AccentHoverColor;
+        var accent = UiSharedService.AccentColor;
+        using var titleBg = ImRaii.PushColor(ImGuiCol.TitleBg, accent);
+        using var titleBgActive = ImRaii.PushColor(ImGuiCol.TitleBgActive, accent);
+        using var titleBgCollapsed = ImRaii.PushColor(ImGuiCol.TitleBgCollapsed, accent);
+        using var buttonHover = ImRaii.PushColor(ImGuiCol.ButtonHovered, UiSharedService.AccentHoverColor);
+        using var buttonActive = ImRaii.PushColor(ImGuiCol.ButtonActive, UiSharedService.AccentActiveColor);
         ImGui.SetCursorPosY(ImGui.GetCursorPosY() - ImGui.GetStyle().WindowPadding.Y - 1f * ImGuiHelpers.GlobalScale + ImGui.GetStyle().ItemSpacing.Y);
         WindowContentWidth = UiSharedService.GetWindowContentRegionWidth();
         if (!_apiController.IsCurrentVersion)
@@ -116,10 +154,10 @@ public class CompactUi : WindowMediatorSubscriberBase
                 var uidTextSize = ImGui.CalcTextSize(unsupported);
                 ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMax().X + ImGui.GetWindowContentRegionMin().X) / 2 - uidTextSize.X / 2);
                 ImGui.AlignTextToFramePadding();
-                ImGui.TextColored(ImGuiColors.DalamudRed, unsupported);
+                ImGui.TextColored(UiSharedService.AccentColor, unsupported);
             }
             UiSharedService.ColorTextWrapped($"Your UmbraSync installation is out of date, the current version is {ver.Major}.{ver.Minor}.{ver.Build}. " +
-                $"It is highly recommended to keep UmbraSync up to date. Open /xlplugins and update the plugin.", ImGuiColors.DalamudRed);
+                $"It is highly recommended to keep UmbraSync up to date. Open /xlplugins and update the plugin.", UiSharedService.AccentColor);
         }
 
         using (ImRaii.PushId("header")) DrawUIDHeader();
@@ -130,42 +168,61 @@ public class CompactUi : WindowMediatorSubscriberBase
         {
             var hasShownSyncShells = _showSyncShells;
 
-            ImGui.PushFont(UiBuilder.IconFont);
+        using (var hoverColor = ImRaii.PushColor(ImGuiCol.ButtonHovered, UiSharedService.AccentHoverColor))
+        using (var activeColor = ImRaii.PushColor(ImGuiCol.ButtonActive, UiSharedService.AccentActiveColor))
+        {
             if (!hasShownSyncShells)
             {
-                ImGui.PushStyleColor(ImGuiCol.Button, ImGui.GetStyle().Colors[(int)ImGuiCol.ButtonHovered]);
+                using var selectedColor = ImRaii.PushColor(ImGuiCol.Button, accent);
+                using (ImRaii.PushFont(UiBuilder.IconFont))
+                {
+                    if (ImGui.Button(FontAwesomeIcon.User.ToIconString(), new Vector2((UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X) / 2, 30 * ImGuiHelpers.GlobalScale)))
+                    {
+                        _showSyncShells = false;
+                    }
+                }
             }
-            if (ImGui.Button(FontAwesomeIcon.User.ToIconString(), new Vector2((UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X) / 2, 30 * ImGuiHelpers.GlobalScale)))
+            else
             {
-                _showSyncShells = false;
+                using (ImRaii.PushFont(UiBuilder.IconFont))
+                {
+                    if (ImGui.Button(FontAwesomeIcon.User.ToIconString(), new Vector2((UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X) / 2, 30 * ImGuiHelpers.GlobalScale)))
+                    {
+                        _showSyncShells = false;
+                    }
+                }
             }
-            if (!hasShownSyncShells)
-            {
-                ImGui.PopStyleColor();
-            }
-            ImGui.PopFont();
+
             UiSharedService.AttachToolTip("Individual pairs");
 
             ImGui.SameLine();
 
-            ImGui.PushFont(UiBuilder.IconFont);
             if (hasShownSyncShells)
             {
-                ImGui.PushStyleColor(ImGuiCol.Button, ImGui.GetStyle().Colors[(int)ImGuiCol.ButtonHovered]);
+                using var selectedColor = ImRaii.PushColor(ImGuiCol.Button, accent);
+                using (ImRaii.PushFont(UiBuilder.IconFont))
+                {
+                    if (ImGui.Button(FontAwesomeIcon.UserFriends.ToIconString(), new Vector2((UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X) / 2, 30 * ImGuiHelpers.GlobalScale)))
+                    {
+                        _showSyncShells = true;
+                    }
+                }
             }
-            if (ImGui.Button(FontAwesomeIcon.UserFriends.ToIconString(), new Vector2((UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X) / 2, 30 * ImGuiHelpers.GlobalScale)))
+            else
             {
-                _showSyncShells = true;
+                using (ImRaii.PushFont(UiBuilder.IconFont))
+                {
+                    if (ImGui.Button(FontAwesomeIcon.UserFriends.ToIconString(), new Vector2((UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X) / 2, 30 * ImGuiHelpers.GlobalScale)))
+                    {
+                        _showSyncShells = true;
+                    }
+                }
             }
-            if (hasShownSyncShells)
-            {
-                ImGui.PopStyleColor();
-            }
-            ImGui.PopFont();
 
             UiSharedService.AttachToolTip("Syncshells");
+        }
 
-            ImGui.Separator();
+            DrawDefaultSyncSettings();
             if (!hasShownSyncShells)
             {
                 using (ImRaii.PushId("pairlist")) DrawPairList();
@@ -178,7 +235,7 @@ public class CompactUi : WindowMediatorSubscriberBase
             using (ImRaii.PushId("transfers")) DrawTransfers();
             TransferPartHeight = ImGui.GetCursorPosY() - TransferPartHeight;
             using (ImRaii.PushId("group-user-popup")) _selectPairsForGroupUi.Draw(_pairManager.DirectPairs);
-            using (ImRaii.PushId("grouping-popup")) _selectGroupForPairUi.Draw();
+                using (ImRaii.PushId("grouping-popup")) _selectGroupForPairUi.Draw();
         }
 
         if (_configService.Current.OpenPopupOnAdd && _pairManager.LastAddedUser != null)
@@ -228,6 +285,293 @@ public class CompactUi : WindowMediatorSubscriberBase
         base.OnClose();
     }
 
+    private void DrawDefaultSyncSettings()
+    {
+        ImGuiHelpers.ScaledDummy(4f);
+        using (ImRaii.PushId("sync-defaults"))
+        {
+            const string soundLabel = "Audio";
+            const string animLabel = "Anim";
+            const string vfxLabel = "VFX";
+            const string soundSubject = "de l'audio";
+            const string animSubject = "des animations";
+            const string vfxSubject = "des effets visuels";
+
+            bool soundsDisabled = _configService.Current.DefaultDisableSounds;
+            bool animsDisabled = _configService.Current.DefaultDisableAnimations;
+            bool vfxDisabled = _configService.Current.DefaultDisableVfx;
+            bool showNearby = _configService.Current.EnableAutoDetectDiscovery;
+            int pendingInvites = _nearbyPending.Pending.Count;
+
+            const string nearbyLabel = "AutoDetect";
+
+
+            var soundIcon = soundsDisabled ? FontAwesomeIcon.VolumeMute : FontAwesomeIcon.VolumeUp;
+            var animIcon = animsDisabled ? FontAwesomeIcon.WindowClose : FontAwesomeIcon.Running;
+            var vfxIcon = vfxDisabled ? FontAwesomeIcon.TimesCircle : FontAwesomeIcon.Sun;
+
+            float spacing = ImGui.GetStyle().ItemSpacing.X;
+            float audioWidth = _uiSharedService.GetIconTextButtonSize(soundIcon, soundLabel);
+            float animWidth = _uiSharedService.GetIconTextButtonSize(animIcon, animLabel);
+            float vfxWidth = _uiSharedService.GetIconTextButtonSize(vfxIcon, vfxLabel);
+            float nearbyWidth = showNearby ? _uiSharedService.GetIconTextButtonSize(FontAwesomeIcon.UserPlus, pendingInvites > 0 ? $"{nearbyLabel} ({pendingInvites})" : nearbyLabel) : 0f;
+            int buttonCount = 3 + (showNearby ? 1 : 0);
+            float totalWidth = audioWidth + animWidth + vfxWidth + nearbyWidth + spacing * (buttonCount - 1);
+            float available = ImGui.GetContentRegionAvail().X;
+            float startCursorX = ImGui.GetCursorPosX();
+            if (totalWidth < available)
+            {
+                ImGui.SetCursorPosX(startCursorX + (available - totalWidth) / 2f);
+            }
+
+            DrawDefaultSyncButton(soundIcon, soundLabel, audioWidth, soundsDisabled,
+                state =>
+                {
+                    _configService.Current.DefaultDisableSounds = state;
+                    _configService.Save();
+                    Mediator.Publish(new ApplyDefaultsToAllSyncsMessage(soundSubject, state));
+                },
+                () => DisableStateTooltip(soundSubject, _configService.Current.DefaultDisableSounds));
+
+            DrawDefaultSyncButton(animIcon, animLabel, animWidth, animsDisabled,
+                state =>
+                {
+                    _configService.Current.DefaultDisableAnimations = state;
+                    _configService.Save();
+                    Mediator.Publish(new ApplyDefaultsToAllSyncsMessage(animSubject, state));
+                },
+                () => DisableStateTooltip(animSubject, _configService.Current.DefaultDisableAnimations), spacing);
+
+            DrawDefaultSyncButton(vfxIcon, vfxLabel, vfxWidth, vfxDisabled,
+                state =>
+                {
+                    _configService.Current.DefaultDisableVfx = state;
+                    _configService.Save();
+                    Mediator.Publish(new ApplyDefaultsToAllSyncsMessage(vfxSubject, state));
+                },
+                () => DisableStateTooltip(vfxSubject, _configService.Current.DefaultDisableVfx), spacing);
+
+            if (showNearby)
+            {
+                ImGui.SameLine(0, spacing);
+                var autodetectLabel = pendingInvites > 0 ? $"{nearbyLabel} ({pendingInvites})" : nearbyLabel;
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.UserPlus, autodetectLabel, nearbyWidth))
+                {
+                    Mediator.Publish(new UiToggleMessage(typeof(AutoDetectUi)));
+                }
+                string tooltip = pendingInvites > 0
+                    ? string.Format("Vous avez {0} invitation{1} reçue. Ouvrez l\'interface AutoDetect pour y répondre.", pendingInvites, pendingInvites > 1 ? "s" : string.Empty)
+                    : "Ouvrir les outils AutoDetect (invitations et proximité).\n\nLes demandes reçues sont listées dans l\'onglet 'Invitations'.";
+                UiSharedService.AttachToolTip(tooltip);
+            }
+
+            DrawSelfAnalysisPreview();
+        }
+        ImGui.Separator();
+    }
+
+    private void DrawSelfAnalysisPreview()
+    {
+        using (ImRaii.PushId("self-analysis"))
+        {
+            if (!ImGui.CollapsingHeader("Self Analysis"))
+            {
+                return;
+            }
+
+            var summary = _characterAnalyzer.CurrentSummary;
+            bool isAnalyzing = _characterAnalyzer.IsAnalysisRunning;
+
+            if (isAnalyzing)
+            {
+                UiSharedService.ColorTextWrapped(
+                    $"Analyse en cours ({_characterAnalyzer.CurrentFile}/{System.Math.Max(_characterAnalyzer.TotalFiles, 1)})...",
+                    ImGuiColors.DalamudYellow);
+                if (_uiSharedService.IconTextButton(FontAwesomeIcon.StopCircle, "Annuler l'analyse"))
+                {
+                    _characterAnalyzer.CancelAnalyze();
+                }
+                UiSharedService.AttachToolTip("Stopper l'analyse en cours.");
+            }
+            else
+            {
+                bool recalculate = !summary.HasUncomputedEntries && !summary.IsEmpty;
+                var label = recalculate ? "Recalculer l'analyse" : "Lancer l'analyse";
+                var icon = recalculate ? FontAwesomeIcon.Sync : FontAwesomeIcon.PlayCircle;
+                if (_uiSharedService.IconTextButton(icon, label))
+                {
+                    _ = _characterAnalyzer.ComputeAnalysis(print: false, recalculate: recalculate);
+                }
+                UiSharedService.AttachToolTip(recalculate
+                    ? "Recalcule toutes les entrées pour mettre à jour les tailles partagées."
+                    : "Analyse vos fichiers actuels pour estimer le poids partagé.");
+            }
+
+            if (summary.IsEmpty && !isAnalyzing)
+            {
+                UiSharedService.ColorTextWrapped("Aucune donnée analysée pour l'instant. Lancez une analyse pour générer cet aperçu.",
+                    ImGuiColors.DalamudGrey2);
+                return;
+            }
+
+            if (summary.HasUncomputedEntries && !isAnalyzing)
+            {
+                UiSharedService.ColorTextWrapped("Certaines entrées n'ont pas encore de taille calculée. Lancez l'analyse pour compléter les données.",
+                    ImGuiColors.DalamudYellow);
+            }
+
+            ImGuiHelpers.ScaledDummy(4f);
+
+            UiSharedService.DrawGrouped(() =>
+            {
+                if (ImGui.BeginTable("self-analysis-stats", 2, ImGuiTableFlags.SizingStretchProp | ImGuiTableFlags.NoSavedSettings))
+                {
+                    ImGui.TableSetupColumn("label", ImGuiTableColumnFlags.WidthStretch, 0.55f);
+                    ImGui.TableSetupColumn("value", ImGuiTableColumnFlags.WidthStretch, 0.45f);
+
+                    DrawSelfAnalysisStatRow("Fichiers moddés", summary.TotalFiles.ToString("N0", CultureInfo.CurrentCulture));
+
+                    var compressedValue = UiSharedService.ByteToString(summary.TotalCompressedSize);
+                    Vector4? compressedColor = null;
+                    FontAwesomeIcon? compressedIcon = null;
+                    Vector4? compressedIconColor = null;
+                    string? compressedTooltip = null;
+                    if (summary.HasUncomputedEntries)
+                    {
+                        compressedColor = ImGuiColors.DalamudYellow;
+                        compressedTooltip = "Lancez l'analyse pour calculer la taille de téléchargement exacte.";
+                    }
+                    else if (summary.TotalCompressedSize >= SelfAnalysisSizeWarningThreshold)
+                    {
+                        compressedColor = ImGuiColors.DalamudYellow;
+                        compressedTooltip = "Au-delà de 300 MiB, certains joueurs peuvent ne pas voir toutes vos modifications.";
+                        compressedIcon = FontAwesomeIcon.ExclamationTriangle;
+                        compressedIconColor = ImGuiColors.DalamudYellow;
+                    }
+
+                    DrawSelfAnalysisStatRow("Taille compressée", compressedValue, compressedColor, compressedTooltip, compressedIcon, compressedIconColor);
+                    DrawSelfAnalysisStatRow("Taille extraite", UiSharedService.ByteToString(summary.TotalOriginalSize));
+
+                    Vector4? trianglesColor = null;
+                    FontAwesomeIcon? trianglesIcon = null;
+                    Vector4? trianglesIconColor = null;
+                    string? trianglesTooltip = null;
+                    if (summary.TotalTriangles >= SelfAnalysisTriangleWarningThreshold)
+                    {
+                        trianglesColor = ImGuiColors.DalamudYellow;
+                        trianglesTooltip = "Plus de 150k triangles peuvent entraîner un auto-pause et impacter les performances.";
+                        trianglesIcon = FontAwesomeIcon.ExclamationTriangle;
+                        trianglesIconColor = ImGuiColors.DalamudYellow;
+                    }
+                    DrawSelfAnalysisStatRow("Triangles moddés", UiSharedService.TrisToString(summary.TotalTriangles), trianglesColor, trianglesTooltip, trianglesIcon, trianglesIconColor);
+
+                    ImGui.EndTable();
+                }
+            }, rounding: 4f, expectedWidth: ImGui.GetContentRegionAvail().X);
+
+            string lastAnalysisText;
+            Vector4 lastAnalysisColor = ImGuiColors.DalamudGrey2;
+            if (isAnalyzing)
+            {
+                lastAnalysisText = "Dernière analyse : en cours...";
+                lastAnalysisColor = ImGuiColors.DalamudYellow;
+            }
+            else if (_characterAnalyzer.LastCompletedAnalysis.HasValue)
+            {
+                var localTime = _characterAnalyzer.LastCompletedAnalysis.Value.ToLocalTime();
+                lastAnalysisText = $"Dernière analyse : {localTime.ToString("g", CultureInfo.CurrentCulture)}";
+            }
+            else
+            {
+                lastAnalysisText = "Dernière analyse : jamais";
+            }
+
+            ImGuiHelpers.ScaledDummy(2f);
+            UiSharedService.ColorTextWrapped(lastAnalysisText, lastAnalysisColor);
+
+            ImGuiHelpers.ScaledDummy(4f);
+
+            if (_uiSharedService.IconTextButton(FontAwesomeIcon.PersonCircleQuestion, "Ouvrir l'analyse détaillée"))
+            {
+                Mediator.Publish(new UiToggleMessage(typeof(DataAnalysisUi)));
+            }
+        }
+    }
+
+    private static void DrawSelfAnalysisStatRow(string label, string value, Vector4? valueColor = null, string? tooltip = null, FontAwesomeIcon? icon = null, Vector4? iconColor = null)
+    {
+        ImGui.TableNextRow();
+        ImGui.TableNextColumn();
+        ImGui.TextUnformatted(label);
+        ImGui.TableNextColumn();
+        if (icon.HasValue)
+        {
+            using (ImRaii.PushFont(UiBuilder.IconFont))
+            {
+                if (iconColor.HasValue)
+                {
+                    using var iconColorPush = ImRaii.PushColor(ImGuiCol.Text, iconColor.Value);
+                    ImGui.TextUnformatted(icon.Value.ToIconString());
+                }
+                else
+                {
+                    ImGui.TextUnformatted(icon.Value.ToIconString());
+                }
+            }
+            ImGui.SameLine(0f, 4f);
+        }
+
+        if (valueColor.HasValue)
+        {
+            using var color = ImRaii.PushColor(ImGuiCol.Text, valueColor.Value);
+            ImGui.TextUnformatted(value);
+        }
+        else
+        {
+            ImGui.TextUnformatted(value);
+        }
+
+        if (!string.IsNullOrEmpty(tooltip))
+        {
+            UiSharedService.AttachToolTip(tooltip);
+        }
+    }
+
+    private void DrawDefaultSyncButton(FontAwesomeIcon icon, string label, float width, bool currentState,
+        Action<bool> onToggle, Func<string> tooltipProvider, float spacingOverride = -1f)
+    {
+        if (spacingOverride >= 0f)
+        {
+            ImGui.SameLine(0, spacingOverride);
+        }
+
+        var colorsPushed = 0;
+        if (currentState)
+        {
+            ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0.95f, 0.35f, 0.35f, 1f));
+            colorsPushed++;
+        }
+
+        if (_uiSharedService.IconTextButton(icon, label, width))
+        {
+            var newState = !currentState;
+            onToggle(newState);
+        }
+
+        if (colorsPushed > 0)
+        {
+            ImGui.PopStyleColor(colorsPushed);
+        }
+
+        UiSharedService.AttachToolTip(tooltipProvider());
+    }
+
+    private static string DisableStateTooltip(string context, bool disabled)
+    {
+        var state = disabled ? "désactivée" : "activée";
+        return $"Synchronisation {context} par défaut : {state}.\nCliquez pour modifier.";
+    }
+
     private void DrawAddCharacter()
     {
         ImGui.Dummy(new(10));
@@ -359,17 +703,112 @@ public class CompactUi : WindowMediatorSubscriberBase
             : (ImGui.GetWindowContentRegionMax().Y - ImGui.GetWindowContentRegionMin().Y) - TransferPartHeight - ImGui.GetCursorPosY();
         var users = GetFilteredUsers().OrderBy(u => u.GetPairSortKey(), StringComparer.Ordinal);
 
-        var onlineUsers = users.Where(u => u.UserPair!.OtherPermissions.IsPaired() && (u.IsOnline || u.UserPair!.OwnPermissions.IsPaused())).Select(c => new DrawUserPair("Online" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService, _charaDataManager)).ToList();
-        var visibleUsers = users.Where(u => u.IsVisible).Select(c => new DrawUserPair("Visible" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService, _charaDataManager)).ToList();
-        var offlineUsers = users.Where(u => !u.UserPair!.OtherPermissions.IsPaired() || (!u.IsOnline && !u.UserPair!.OwnPermissions.IsPaused())).Select(c => new DrawUserPair("Offline" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService, _charaDataManager)).ToList();
-
         ImGui.BeginChild("list", new Vector2(WindowContentWidth, ySize), border: false);
 
+        var pendingCount = _nearbyPending?.Pending.Count ?? 0;
+        if (pendingCount > 0)
+        {
+            UiSharedService.ColorTextWrapped("Invitation AutoDetect en attente. Ouvrez l\'interface AutoDetect pour gérer vos demandes.", ImGuiColors.DalamudYellow);
+            ImGuiHelpers.ScaledDummy(4);
+        }
+
+        var onlineUsers = users.Where(u => u.UserPair!.OtherPermissions.IsPaired() && (u.IsOnline || u.UserPair!.OwnPermissions.IsPaused())).Select(c => new DrawUserPair("Online" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService, _charaDataManager, _serverManager)).ToList();
+        var visibleUsers = users.Where(u => u.IsVisible).Select(c => new DrawUserPair("Visible" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService, _charaDataManager, _serverManager)).ToList();
+        var offlineUsers = users.Where(u => !u.UserPair!.OtherPermissions.IsPaired() || (!u.IsOnline && !u.UserPair!.OwnPermissions.IsPaused())).Select(c => new DrawUserPair("Offline" + c.UserData.UID, c, _uidDisplayHandler, _apiController, Mediator, _selectGroupForPairUi, _uiSharedService, _charaDataManager, _serverManager)).ToList();
+
         _pairGroupsUi.Draw(visibleUsers, onlineUsers, offlineUsers);
 
+        if (_configService.Current.EnableAutoDetectDiscovery)
+        {
+            using (ImRaii.PushId("group-Nearby"))
+            {
+                var icon = _nearbyOpen ? FontAwesomeIcon.CaretSquareDown : FontAwesomeIcon.CaretSquareRight;
+                _uiSharedService.IconText(icon);
+                if (ImGui.IsItemClicked(ImGuiMouseButton.Left)) _nearbyOpen = !_nearbyOpen;
+                ImGui.SameLine();
+                var onUmbra = _nearbyEntries?.Count(e => e.IsMatch && e.AcceptPairRequests && !string.IsNullOrEmpty(e.Token) && !IsAlreadyPairedQuickMenu(e)) ?? 0;
+                ImGui.TextUnformatted($"Nearby ({onUmbra})");
+                if (ImGui.IsItemClicked(ImGuiMouseButton.Left)) _nearbyOpen = !_nearbyOpen;
+                if (_nearbyOpen)
+                {
+                    ImGui.Indent();
+                    var nearby = _nearbyEntries == null
+                        ? new List<Services.Mediator.NearbyEntry>()
+                        : _nearbyEntries.Where(e => e.IsMatch && e.AcceptPairRequests && !string.IsNullOrEmpty(e.Token) && !IsAlreadyPairedQuickMenu(e))
+                            .OrderBy(e => e.Distance)
+                            .ToList();
+                    if (nearby.Count == 0)
+                    {
+                        UiSharedService.ColorTextWrapped("Aucun nouveau joueur detecté.", ImGuiColors.DalamudGrey3);
+                    }
+                    else
+                    {
+                        foreach (var e in nearby)
+                        {
+                            if (!e.AcceptPairRequests || string.IsNullOrEmpty(e.Token))
+                                continue;
+
+                            var name = e.DisplayName ?? e.Name;
+                            ImGui.AlignTextToFramePadding();
+                            ImGui.TextUnformatted(name);
+                            var right = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth();
+                            ImGui.SameLine();
+
+                            var statusButtonSize = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.UserPlus);
+                            ImGui.SetCursorPosX(right - statusButtonSize.X);
+                            if (!e.AcceptPairRequests)
+                            {
+                                _uiSharedService.IconText(FontAwesomeIcon.Ban, ImGuiColors.DalamudGrey3);
+                                UiSharedService.AttachToolTip("Les demandes sont désactivées pour ce joueur");
+                            }
+                            else if (!string.IsNullOrEmpty(e.Token))
+                            {
+                                using (ImRaii.PushId(e.Token ?? e.Uid ?? e.Name ?? string.Empty))
+                                {
+                                    if (_uiSharedService.IconButton(FontAwesomeIcon.UserPlus))
+                                    {
+                                        _ = _autoDetectRequestService.SendRequestAsync(e.Token!, e.Uid, e.DisplayName);
+                                    }
+                                }
+                                UiSharedService.AttachToolTip("Envoyer une invitation d'apparaige");
+                            }
+                            else
+                            {
+                                _uiSharedService.IconText(FontAwesomeIcon.QuestionCircle, ImGuiColors.DalamudGrey3);
+                                UiSharedService.AttachToolTip("Impossible d'inviter ce joueur");
+                            }
+                        }
+                    }
+                    ImGui.Unindent();
+                    ImGui.Separator();
+                }
+            }
+        }
+
         ImGui.EndChild();
     }
 
+    private bool IsAlreadyPairedQuickMenu(Services.Mediator.NearbyEntry entry)
+    {
+        try
+        {
+            if (!string.IsNullOrEmpty(entry.Uid))
+            {
+                if (_pairManager.DirectPairs.Any(p => string.Equals(p.UserData.UID, entry.Uid, StringComparison.Ordinal)))
+                    return true;
+            }
+
+            var key = (entry.DisplayName ?? entry.Name) ?? string.Empty;
+            if (string.IsNullOrEmpty(key)) return false;
+
+            return _pairManager.DirectPairs.Any(p => string.Equals(p.UserData.AliasOrUID, key, StringComparison.OrdinalIgnoreCase));
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
     private void DrawServerStatus()
     {
         var buttonSize = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.Link);
@@ -384,7 +823,7 @@ public class CompactUi : WindowMediatorSubscriberBase
         {
             ImGui.SetCursorPosX((ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth()) / 2 - (userSize.X + textSize.X) / 2 - ImGui.GetStyle().ItemSpacing.X / 2);
             if (!printShard) ImGui.AlignTextToFramePadding();
-            ImGui.TextColored(ImGuiColors.ParsedBlue, userCount);
+            ImGui.TextColored(UiSharedService.AccentColor, userCount);
             ImGui.SameLine();
             if (!printShard) ImGui.AlignTextToFramePadding();
             ImGui.TextUnformatted("Users Online");
@@ -392,7 +831,7 @@ public class CompactUi : WindowMediatorSubscriberBase
         else
         {
             ImGui.AlignTextToFramePadding();
-            ImGui.TextColored(ImGuiColors.DalamudRed, "Not connected to any server");
+            ImGui.TextColored(UiSharedService.AccentColor, "Not connected to any server");
         }
 
         if (printShard)
@@ -407,8 +846,9 @@ public class CompactUi : WindowMediatorSubscriberBase
         {
             ImGui.SetCursorPosY(ImGui.GetCursorPosY() - ((userSize.Y + textSize.Y) / 2 + shardTextSize.Y) / 2 - ImGui.GetStyle().ItemSpacing.Y + buttonSize.Y / 2);
         }
-        var color = UiSharedService.GetBoolColor(!_serverManager.CurrentServer!.FullPause);
-        var connectedIcon = !_serverManager.CurrentServer.FullPause ? FontAwesomeIcon.Link : FontAwesomeIcon.Unlink;
+        var isLinked = !_serverManager.CurrentServer!.FullPause;
+        var color = isLinked ? new Vector4(0.63f, 0.25f, 1f, 1f) : UiSharedService.GetBoolColor(isLinked);
+        var connectedIcon = isLinked ? FontAwesomeIcon.Link : FontAwesomeIcon.Unlink;
 
         if (_apiController.ServerState is ServerState.Connected)
         {
@@ -483,22 +923,19 @@ public class CompactUi : WindowMediatorSubscriberBase
             ImGui.SameLine(WindowContentWidth - textSize.X);
             ImGui.TextUnformatted(downloadText);
         }
-
-        var bottomButtonWidth = (WindowContentWidth - ImGui.GetStyle().ItemSpacing.X) / 2;
-
+        var spacing = ImGui.GetStyle().ItemSpacing.X;
+        var bottomButtonWidth = (WindowContentWidth - spacing) / 2f;
         if (_uiSharedService.IconTextButton(FontAwesomeIcon.PersonCircleQuestion, "Character Analysis", bottomButtonWidth))
         {
             Mediator.Publish(new UiToggleMessage(typeof(DataAnalysisUi)));
         }
 
         ImGui.SameLine();
-
         if (_uiSharedService.IconTextButton(FontAwesomeIcon.Running, "Character Data Hub", bottomButtonWidth))
         {
             Mediator.Publish(new UiToggleMessage(typeof(CharaDataHubUi)));
         }
-
-        ImGui.SameLine();
+        ImGuiHelpers.ScaledDummy(2);
     }
 
     private void DrawUIDHeader()
@@ -524,7 +961,7 @@ public class CompactUi : WindowMediatorSubscriberBase
         }
         UiSharedService.AttachToolTip("Open the UmbraSync Settings");
 
-        ImGui.SameLine(); //Important to draw the uidText consistently
+        ImGui.SameLine();
         ImGui.SetCursorPos(originalPos);
 
         if (_apiController.ServerState is ServerState.Connected)
@@ -546,8 +983,8 @@ public class CompactUi : WindowMediatorSubscriberBase
             ImGui.TextColored(GetUidColor(), uidText);
 
         if (_apiController.ServerState is not ServerState.Connected)
-        {
             UiSharedService.ColorTextWrapped(GetServerError(), GetUidColor());
+        {
             if (_apiController.ServerState is ServerState.NoSecretKey)
             {
                 DrawAddCharacter();
@@ -586,22 +1023,22 @@ public class CompactUi : WindowMediatorSubscriberBase
         };
     }
 
-    private Vector4 GetUidColor()
+     private Vector4 GetUidColor()
     {
         return _apiController.ServerState switch
         {
             ServerState.Connecting => ImGuiColors.DalamudYellow,
-            ServerState.Reconnecting => ImGuiColors.DalamudRed,
-            ServerState.Connected => new Vector4(0.2f, 0.6f, 1f, 1f), // custom blue
+            ServerState.Reconnecting => UiSharedService.AccentColor,
+            ServerState.Connected => UiSharedService.AccentColor,
             ServerState.Disconnected => ImGuiColors.DalamudYellow,
             ServerState.Disconnecting => ImGuiColors.DalamudYellow,
-            ServerState.Unauthorized => ImGuiColors.DalamudRed,
-            ServerState.VersionMisMatch => ImGuiColors.DalamudRed,
-            ServerState.Offline => ImGuiColors.DalamudRed,
+            ServerState.Unauthorized => UiSharedService.AccentColor,
+            ServerState.VersionMisMatch => UiSharedService.AccentColor,
+            ServerState.Offline => UiSharedService.AccentColor,
             ServerState.RateLimited => ImGuiColors.DalamudYellow,
             ServerState.NoSecretKey => ImGuiColors.DalamudYellow,
             ServerState.MultiChara => ImGuiColors.DalamudYellow,
-            _ => ImGuiColors.DalamudRed
+            _ => UiSharedService.AccentColor
         };
     }
 
@@ -634,4 +1071,4 @@ public class CompactUi : WindowMediatorSubscriberBase
         _wasOpen = IsOpen;
         IsOpen = false;
     }
-}
+}

MareSynchronos/UI/Components/DrawGroupPair.cs

@@ -1,14 +1,21 @@
-using Dalamud.Bindings.ImGui;
+using System;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
+using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Enum;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.API.Dto.Group;
-using MareSynchronos.API.Dto.User;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services;
+using MareSynchronos.Services.AutoDetect;
 using MareSynchronos.Services.Mediator;
+using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.UI.Handlers;
 using MareSynchronos.WebAPI;
 
@@ -20,16 +27,22 @@ public class DrawGroupPair : DrawPairBase
     private readonly GroupPairFullInfoDto _fullInfoDto;
     private readonly GroupFullInfoDto _group;
     private readonly CharaDataManager _charaDataManager;
+    private readonly AutoDetectRequestService _autoDetectRequestService;
+    private readonly ServerConfigurationManager _serverConfigurationManager;
+    private const string ManualPairInvitePrefix = "[UmbraPairInvite|";
 
     public DrawGroupPair(string id, Pair entry, ApiController apiController,
         MareMediator mareMediator, GroupFullInfoDto group, GroupPairFullInfoDto fullInfoDto,
-        UidDisplayHandler handler, UiSharedService uiSharedService, CharaDataManager charaDataManager)
+        UidDisplayHandler handler, UiSharedService uiSharedService, CharaDataManager charaDataManager,
+        AutoDetectRequestService autoDetectRequestService, ServerConfigurationManager serverConfigurationManager)
         : base(id, entry, apiController, handler, uiSharedService)
     {
         _group = group;
         _fullInfoDto = fullInfoDto;
         _mediator = mareMediator;
         _charaDataManager = charaDataManager;
+        _autoDetectRequestService = autoDetectRequestService;
+        _serverConfigurationManager = serverConfigurationManager;
     }
 
     protected override void DrawLeftSide(float textPosY, float originalY)
@@ -38,15 +51,15 @@ public class DrawGroupPair : DrawPairBase
         var entryIsMod = _fullInfoDto.GroupPairStatusInfo.IsModerator();
         var entryIsOwner = string.Equals(_pair.UserData.UID, _group.OwnerUID, StringComparison.Ordinal);
         var entryIsPinned = _fullInfoDto.GroupPairStatusInfo.IsPinned();
-        var presenceIcon = _pair.IsVisible ? FontAwesomeIcon.Eye : (_pair.IsOnline ? FontAwesomeIcon.Link : FontAwesomeIcon.Unlink);
-        var presenceColor = (_pair.IsOnline || _pair.IsVisible) ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed;
+        var presenceIcon = _pair.IsVisible ? FontAwesomeIcon.Eye : FontAwesomeIcon.CloudMoon;
+        var presenceColor = (_pair.IsOnline || _pair.IsVisible) ? new Vector4(0.63f, 0.25f, 1f, 1f) : ImGuiColors.DalamudGrey;
         var presenceText = entryUID + " is offline";
 
         ImGui.SetCursorPosY(textPosY);
+        bool drewPrefixIcon = false;
+
         if (_pair.IsPaused)
         {
-            presenceIcon = FontAwesomeIcon.Question;
-            presenceColor = ImGuiColors.DalamudGrey;
             presenceText = entryUID + " online status is unknown (paused)";
 
             ImGui.PushFont(UiBuilder.IconFont);
@@ -54,24 +67,32 @@ public class DrawGroupPair : DrawPairBase
             ImGui.PopFont();
 
             UiSharedService.AttachToolTip("Pairing status with " + entryUID + " is paused");
+            drewPrefixIcon = true;
         }
         else
         {
-            ImGui.PushFont(UiBuilder.IconFont);
-            UiSharedService.ColorText(FontAwesomeIcon.Check.ToIconString(), ImGuiColors.ParsedGreen);
-            ImGui.PopFont();
-
-            UiSharedService.AttachToolTip("You are paired with " + entryUID);
+            bool individuallyPaired = _pair.UserPair != null;
+            var violet = new Vector4(0.63f, 0.25f, 1f, 1f);
+            if (individuallyPaired && (_pair.IsOnline || _pair.IsVisible))
+            {
+                ImGui.PushFont(UiBuilder.IconFont);
+                UiSharedService.ColorText(FontAwesomeIcon.Moon.ToIconString(), violet);
+                ImGui.PopFont();
+                UiSharedService.AttachToolTip("You are individually paired with " + entryUID);
+                drewPrefixIcon = true;
+            }
         }
+        if (drewPrefixIcon)
+            ImGui.SameLine();
 
-        if (_pair.IsOnline && !_pair.IsVisible) presenceText = entryUID + " is online";
-        else if (_pair.IsOnline && _pair.IsVisible) presenceText = entryUID + " is visible: " + _pair.PlayerName + Environment.NewLine + "Click to target this player";
-
-        ImGui.SameLine();
         ImGui.SetCursorPosY(textPosY);
         ImGui.PushFont(UiBuilder.IconFont);
         UiSharedService.ColorText(presenceIcon.ToIconString(), presenceColor);
         ImGui.PopFont();
+
+        if (_pair.IsOnline && !_pair.IsVisible) presenceText = entryUID + " is online";
+        else if (_pair.IsOnline && _pair.IsVisible) presenceText = entryUID + " is visible: " + _pair.PlayerName + Environment.NewLine + "Click to target this player";
+
         if (_pair.IsVisible)
         {
             if (ImGui.IsItemClicked())
@@ -94,6 +115,7 @@ public class DrawGroupPair : DrawPairBase
                 }
             }
         }
+
         UiSharedService.AttachToolTip(presenceText);
 
         if (entryIsOwner)
@@ -143,8 +165,9 @@ public class DrawGroupPair : DrawPairBase
 
         bool showShared = _charaDataManager.SharedWithYouData.TryGetValue(_pair.UserData, out var sharedData);
         bool showInfo = (individualAnimDisabled || individualSoundsDisabled || animDisabled || soundsDisabled);
-        bool showPlus = _pair.UserPair == null;
+        bool showPlus = _pair.UserPair == null && _pair.IsOnline;
         bool showBars = (userIsOwner || (userIsModerator && !entryIsMod && !entryIsOwner)) || !_pair.IsPaused;
+        bool showPause = true;
 
         var spacing = ImGui.GetStyle().ItemSpacing.X;
         var permIcon = (individualAnimDisabled || individualSoundsDisabled || individualVFXDisabled) ? FontAwesomeIcon.ExclamationTriangle
@@ -152,12 +175,15 @@ public class DrawGroupPair : DrawPairBase
         var runningIconWidth = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.Running).X;
         var infoIconWidth = UiSharedService.GetIconSize(permIcon).X;
         var plusButtonWidth = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.Plus).X;
+        var pauseIcon = _fullInfoDto.GroupUserPermissions.IsPaused() ? FontAwesomeIcon.Play : FontAwesomeIcon.Pause;
+        var pauseButtonWidth = _uiSharedService.GetIconButtonSize(pauseIcon).X;
         var barButtonWidth = _uiSharedService.GetIconButtonSize(FontAwesomeIcon.Bars).X;
 
         var pos = ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth() + spacing
             - (showShared ? (runningIconWidth + spacing) : 0)
             - (showInfo ? (infoIconWidth + spacing) : 0)
             - (showPlus ? (plusButtonWidth + spacing) : 0)
+            - (showPause ? (pauseButtonWidth + spacing) : 0)
             - (showBars ? (barButtonWidth + spacing) : 0);
 
         ImGui.SameLine(pos);
@@ -191,7 +217,7 @@ public class DrawGroupPair : DrawPairBase
                 if (individualSoundsDisabled)
                 {
                     var userSoundsText = "Sound sync disabled with " + _pair.UserData.AliasOrUID;
-                    _uiSharedService.IconText(FontAwesomeIcon.VolumeOff);
+                    _uiSharedService.IconText(FontAwesomeIcon.VolumeMute);
                     ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                     ImGui.TextUnformatted(userSoundsText);
                     ImGui.NewLine();
@@ -202,7 +228,7 @@ public class DrawGroupPair : DrawPairBase
                 if (individualAnimDisabled)
                 {
                     var userAnimText = "Animation sync disabled with " + _pair.UserData.AliasOrUID;
-                    _uiSharedService.IconText(FontAwesomeIcon.Stop);
+                    _uiSharedService.IconText(FontAwesomeIcon.WindowClose);
                     ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                     ImGui.TextUnformatted(userAnimText);
                     ImGui.NewLine();
@@ -213,7 +239,7 @@ public class DrawGroupPair : DrawPairBase
                 if (individualVFXDisabled)
                 {
                     var userVFXText = "VFX sync disabled with " + _pair.UserData.AliasOrUID;
-                    _uiSharedService.IconText(FontAwesomeIcon.Circle);
+                    _uiSharedService.IconText(FontAwesomeIcon.TimesCircle);
                     ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                     ImGui.TextUnformatted(userVFXText);
                     ImGui.NewLine();
@@ -238,7 +264,7 @@ public class DrawGroupPair : DrawPairBase
                 if (soundsDisabled)
                 {
                     var userSoundsText = "Sound sync disabled by " + _pair.UserData.AliasOrUID;
-                    _uiSharedService.IconText(FontAwesomeIcon.VolumeOff);
+                    _uiSharedService.IconText(FontAwesomeIcon.VolumeMute);
                     ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                     ImGui.TextUnformatted(userSoundsText);
                 }
@@ -246,7 +272,7 @@ public class DrawGroupPair : DrawPairBase
                 if (animDisabled)
                 {
                     var userAnimText = "Animation sync disabled by " + _pair.UserData.AliasOrUID;
-                    _uiSharedService.IconText(FontAwesomeIcon.Stop);
+                    _uiSharedService.IconText(FontAwesomeIcon.WindowClose);
                     ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                     ImGui.TextUnformatted(userAnimText);
                 }
@@ -254,7 +280,7 @@ public class DrawGroupPair : DrawPairBase
                 if (vfxDisabled)
                 {
                     var userVFXText = "VFX sync disabled by " + _pair.UserData.AliasOrUID;
-                    _uiSharedService.IconText(FontAwesomeIcon.Circle);
+                    _uiSharedService.IconText(FontAwesomeIcon.TimesCircle);
                     ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                     ImGui.TextUnformatted(userVFXText);
                 }
@@ -270,9 +296,28 @@ public class DrawGroupPair : DrawPairBase
 
             if (_uiSharedService.IconButton(FontAwesomeIcon.Plus))
             {
-                _ = _apiController.UserAddPair(new UserDto(new(_pair.UserData.UID)));
+                var targetUid = _pair.UserData.UID;
+                if (!string.IsNullOrEmpty(targetUid))
+                {
+                    _ = SendGroupPairInviteAsync(targetUid, entryUID);
+                }
             }
-            UiSharedService.AttachToolTip("Pair with " + entryUID + " individually");
+            UiSharedService.AttachToolTip(AppendSeenInfo("Send pairing invite to " + entryUID));
+            ImGui.SameLine();
+        }
+
+        if (showPause)
+        {
+            ImGui.SetCursorPosY(originalY);
+
+            if (_uiSharedService.IconButton(pauseIcon))
+            {
+                var newPermissions = _fullInfoDto.GroupUserPermissions ^ GroupUserPermissions.Paused;
+                _fullInfoDto.GroupUserPermissions = newPermissions;
+                _ = _apiController.GroupChangeIndividualPermissionState(new GroupPairUserPermissionDto(_group.Group, _pair.UserData, newPermissions));
+            }
+
+            UiSharedService.AttachToolTip(AppendSeenInfo((_fullInfoDto.GroupUserPermissions.IsPaused() ? "Resume" : "Pause") + " syncing with " + entryUID));
             ImGui.SameLine();
         }
 
@@ -373,4 +418,74 @@ public class DrawGroupPair : DrawPairBase
 
         return pos - spacing;
     }
-}
+
+    private string AppendSeenInfo(string tooltip)
+    {
+        if (_pair.IsVisible) return tooltip;
+
+        var lastSeen = _serverConfigurationManager.GetNameForUid(_pair.UserData.UID);
+        if (string.IsNullOrWhiteSpace(lastSeen)) return tooltip;
+
+        return tooltip + " (Vu sous : " + lastSeen + ")";
+    }
+
+    private async Task SendGroupPairInviteAsync(string targetUid, string displayName)
+    {
+        try
+        {
+            var ok = await _autoDetectRequestService.SendDirectUidRequestAsync(targetUid, displayName).ConfigureAwait(false);
+            if (!ok) return;
+
+            await SendManualInviteSignalAsync(targetUid, displayName).ConfigureAwait(false);
+        }
+        catch
+        {
+            // errors are logged within the request service; ignore here
+        }
+    }
+
+    private async Task SendManualInviteSignalAsync(string targetUid, string displayName)
+    {
+        if (string.IsNullOrEmpty(_apiController.UID)) return;
+
+        var senderAliasRaw = string.IsNullOrEmpty(_apiController.DisplayName) ? _apiController.UID : _apiController.DisplayName;
+        var senderAlias = EncodeInviteField(senderAliasRaw);
+        var targetDisplay = EncodeInviteField(displayName);
+        var inviteId = Guid.NewGuid().ToString("N");
+        var payloadText = new StringBuilder()
+            .Append(ManualPairInvitePrefix)
+            .Append(_apiController.UID)
+            .Append('|')
+            .Append(senderAlias)
+            .Append('|')
+            .Append(targetUid)
+            .Append('|')
+            .Append(targetDisplay)
+            .Append('|')
+            .Append(inviteId)
+            .Append(']')
+            .ToString();
+
+        var payload = new SeStringBuilder().AddText(payloadText).Build().Encode();
+        var chatMessage = new ChatMessage
+        {
+            SenderName = senderAlias,
+            PayloadContent = payload
+        };
+
+        try
+        {
+            await _apiController.GroupChatSendMsg(new GroupDto(_group.Group), chatMessage).ConfigureAwait(false);
+        }
+        catch
+        {
+            // ignore - invite remains tracked locally even if group chat signal fails
+        }
+    }
+
+    private static string EncodeInviteField(string value)
+    {
+        var bytes = Encoding.UTF8.GetBytes(value ?? string.Empty);
+        return Convert.ToBase64String(bytes);
+    }
+}

MareSynchronos/UI/Components/DrawUserPair.cs

@@ -11,18 +11,22 @@ using MareSynchronos.Services.Mediator;
 using MareSynchronos.UI.Handlers;
 using MareSynchronos.WebAPI;
 using System.Numerics;
+using MareSynchronos.Services.ServerConfiguration;
 
 namespace MareSynchronos.UI.Components;
 
 public class DrawUserPair : DrawPairBase
 {
+    private static readonly Vector4 Violet = new(0.63f, 0.25f, 1f, 1f);
     protected readonly MareMediator _mediator;
     private readonly SelectGroupForPairUi _selectGroupForPairUi;
     private readonly CharaDataManager _charaDataManager;
+    private readonly ServerConfigurationManager _serverConfigurationManager;
 
     public DrawUserPair(string id, Pair entry, UidDisplayHandler displayHandler, ApiController apiController,
         MareMediator mareMediator, SelectGroupForPairUi selectGroupForPairUi,
-        UiSharedService uiSharedService, CharaDataManager charaDataManager)
+        UiSharedService uiSharedService, CharaDataManager charaDataManager,
+        ServerConfigurationManager serverConfigurationManager)
         : base(id, entry, apiController, displayHandler, uiSharedService)
     {
         if (_pair.UserPair == null) throw new ArgumentException("Pair must be UserPair", nameof(entry));
@@ -30,6 +34,7 @@ public class DrawUserPair : DrawPairBase
         _selectGroupForPairUi = selectGroupForPairUi;
         _mediator = mareMediator;
         _charaDataManager = charaDataManager;
+        _serverConfigurationManager = serverConfigurationManager;
     }
 
     public bool IsOnline => _pair.IsOnline;
@@ -38,39 +43,40 @@ public class DrawUserPair : DrawPairBase
 
     protected override void DrawLeftSide(float textPosY, float originalY)
     {
-        FontAwesomeIcon connectionIcon;
-        Vector4 connectionColor;
-        string connectionText;
-        if (!(_pair.UserPair!.OwnPermissions.IsPaired() && _pair.UserPair!.OtherPermissions.IsPaired()))
-        {
-            connectionIcon = FontAwesomeIcon.ArrowUp;
-            connectionText = _pair.UserData.AliasOrUID + " has not added you back";
-            connectionColor = ImGuiColors.DalamudRed;
-        }
-        else if (_pair.UserPair!.OwnPermissions.IsPaused() || _pair.UserPair!.OtherPermissions.IsPaused())
-        {
-            connectionIcon = FontAwesomeIcon.PauseCircle;
-            connectionText = "Pairing status with " + _pair.UserData.AliasOrUID + " is paused";
-            connectionColor = ImGuiColors.DalamudYellow;
-        }
-        else
-        {
-            connectionIcon = FontAwesomeIcon.Check;
-            connectionText = "You are paired with " + _pair.UserData.AliasOrUID;
-            connectionColor = ImGuiColors.ParsedGreen;
-        }
+        var online = _pair.IsOnline;
+        var offlineGrey = ImGuiColors.DalamudGrey3;
 
         ImGui.SetCursorPosY(textPosY);
         ImGui.PushFont(UiBuilder.IconFont);
-        UiSharedService.ColorText(connectionIcon.ToIconString(), connectionColor);
+        UiSharedService.ColorText(FontAwesomeIcon.Moon.ToIconString(), online ? Violet : offlineGrey);
         ImGui.PopFont();
-        UiSharedService.AttachToolTip(connectionText);
+        UiSharedService.AttachToolTip(online
+            ? "User is online"
+            : "User is offline");
+        if (!(_pair.UserPair!.OwnPermissions.IsPaired() && _pair.UserPair!.OtherPermissions.IsPaired()))
+        {
+            ImGui.SameLine();
+            ImGui.SetCursorPosY(textPosY);
+            ImGui.PushFont(UiBuilder.IconFont);
+            UiSharedService.ColorText(FontAwesomeIcon.ArrowUp.ToIconString(), UiSharedService.AccentColor);
+            ImGui.PopFont();
+            UiSharedService.AttachToolTip(_pair.UserData.AliasOrUID + " has not added you back");
+        }
+        else if (_pair.UserPair!.OwnPermissions.IsPaused() || _pair.UserPair!.OtherPermissions.IsPaused())
+        {
+            ImGui.SameLine();
+            ImGui.SetCursorPosY(textPosY);
+            ImGui.PushFont(UiBuilder.IconFont);
+            UiSharedService.ColorText(FontAwesomeIcon.PauseCircle.ToIconString(), ImGuiColors.DalamudYellow);
+            ImGui.PopFont();
+            UiSharedService.AttachToolTip("Pairing with " + _pair.UserData.AliasOrUID + " is paused");
+        }
         if (_pair is { IsOnline: true, IsVisible: true })
         {
             ImGui.SameLine();
             ImGui.SetCursorPosY(textPosY);
             ImGui.PushFont(UiBuilder.IconFont);
-            UiSharedService.ColorText(FontAwesomeIcon.Eye.ToIconString(), ImGuiColors.ParsedGreen);
+            UiSharedService.ColorText(FontAwesomeIcon.Eye.ToIconString(), Violet);
             if (ImGui.IsItemClicked())
             {
                 _mediator.Publish(new TargetPairMessage(_pair));
@@ -133,16 +139,14 @@ public class DrawUserPair : DrawPairBase
                 perm.SetPaused(!perm.IsPaused());
                 _ = _apiController.UserSetPairPermissions(new(_pair.UserData, perm));
             }
-            UiSharedService.AttachToolTip(!_pair.UserPair!.OwnPermissions.IsPaused()
+            UiSharedService.AttachToolTip(AppendSeenInfo(!_pair.UserPair!.OwnPermissions.IsPaused()
                 ? "Pause pairing with " + entryUID
-                : "Resume pairing with " + entryUID);
+                : "Resume pairing with " + entryUID));
 
 
             var individualSoundsDisabled = (_pair.UserPair?.OwnPermissions.IsDisableSounds() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableSounds() ?? false);
             var individualAnimDisabled = (_pair.UserPair?.OwnPermissions.IsDisableAnimations() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableAnimations() ?? false);
             var individualVFXDisabled = (_pair.UserPair?.OwnPermissions.IsDisableVFX() ?? false) || (_pair.UserPair?.OtherPermissions.IsDisableVFX() ?? false);
-
-            // Icon for individually applied permissions
             if (individualSoundsDisabled || individualAnimDisabled || individualVFXDisabled)
             {
                 var icon = FontAwesomeIcon.ExclamationTriangle;
@@ -163,7 +167,7 @@ public class DrawUserPair : DrawPairBase
                     if (individualSoundsDisabled)
                     {
                         var userSoundsText = "Sound sync disabled with " + _pair.UserData.AliasOrUID;
-                        _uiSharedService.IconText(FontAwesomeIcon.VolumeOff);
+                        _uiSharedService.IconText(FontAwesomeIcon.VolumeMute);
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                         ImGui.TextUnformatted(userSoundsText);
                         ImGui.NewLine();
@@ -174,7 +178,7 @@ public class DrawUserPair : DrawPairBase
                     if (individualAnimDisabled)
                     {
                         var userAnimText = "Animation sync disabled with " + _pair.UserData.AliasOrUID;
-                        _uiSharedService.IconText(FontAwesomeIcon.Stop);
+                        _uiSharedService.IconText(FontAwesomeIcon.WindowClose);
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                         ImGui.TextUnformatted(userAnimText);
                         ImGui.NewLine();
@@ -185,7 +189,7 @@ public class DrawUserPair : DrawPairBase
                     if (individualVFXDisabled)
                     {
                         var userVFXText = "VFX sync disabled with " + _pair.UserData.AliasOrUID;
-                        _uiSharedService.IconText(FontAwesomeIcon.Circle);
+                        _uiSharedService.IconText(FontAwesomeIcon.TimesCircle);
                         ImGui.SameLine(40 * ImGuiHelpers.GlobalScale);
                         ImGui.TextUnformatted(userVFXText);
                         ImGui.NewLine();
@@ -197,8 +201,6 @@ public class DrawUserPair : DrawPairBase
                 }
             }
         }
-
-        // Icon for shared character data
         if (_charaDataManager.SharedWithYouData.TryGetValue(_pair.UserData, out var sharedData))
         {
             var icon = FontAwesomeIcon.Running;
@@ -265,35 +267,38 @@ public class DrawUserPair : DrawPairBase
         {
             _selectGroupForPairUi.Open(entry);
         }
-        UiSharedService.AttachToolTip("Choose pair groups for " + entryUID);
+        UiSharedService.AttachToolTip(AppendSeenInfo("Choose pair groups for " + entryUID));
 
         var isDisableSounds = entry.UserPair!.OwnPermissions.IsDisableSounds();
         string disableSoundsText = isDisableSounds ? "Enable sound sync" : "Disable sound sync";
-        var disableSoundsIcon = isDisableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeMute;
+        var disableSoundsIcon = isDisableSounds ? FontAwesomeIcon.VolumeMute : FontAwesomeIcon.VolumeUp;
         if (_uiSharedService.IconTextButton(disableSoundsIcon, disableSoundsText))
         {
             var permissions = entry.UserPair.OwnPermissions;
             permissions.SetDisableSounds(!isDisableSounds);
+            _mediator.Publish(new PairSyncOverrideChanged(entry.UserData.UID, permissions.IsDisableSounds(), null, null));
             _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(entry.UserData, permissions));
         }
 
         var isDisableAnims = entry.UserPair!.OwnPermissions.IsDisableAnimations();
         string disableAnimsText = isDisableAnims ? "Enable animation sync" : "Disable animation sync";
-        var disableAnimsIcon = isDisableAnims ? FontAwesomeIcon.Running : FontAwesomeIcon.Stop;
+        var disableAnimsIcon = isDisableAnims ? FontAwesomeIcon.WindowClose : FontAwesomeIcon.Running;
         if (_uiSharedService.IconTextButton(disableAnimsIcon, disableAnimsText))
         {
             var permissions = entry.UserPair.OwnPermissions;
             permissions.SetDisableAnimations(!isDisableAnims);
+            _mediator.Publish(new PairSyncOverrideChanged(entry.UserData.UID, null, permissions.IsDisableAnimations(), null));
             _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(entry.UserData, permissions));
         }
 
         var isDisableVFX = entry.UserPair!.OwnPermissions.IsDisableVFX();
         string disableVFXText = isDisableVFX ? "Enable VFX sync" : "Disable VFX sync";
-        var disableVFXIcon = isDisableVFX ? FontAwesomeIcon.Sun : FontAwesomeIcon.Circle;
+        var disableVFXIcon = isDisableVFX ? FontAwesomeIcon.TimesCircle : FontAwesomeIcon.Sun;
         if (_uiSharedService.IconTextButton(disableVFXIcon, disableVFXText))
         {
             var permissions = entry.UserPair.OwnPermissions;
             permissions.SetDisableVFX(!isDisableVFX);
+            _mediator.Publish(new PairSyncOverrideChanged(entry.UserData.UID, null, null, permissions.IsDisableVFX()));
             _ = _apiController.UserSetPairPermissions(new UserPermissionsDto(entry.UserData, permissions));
         }
 
@@ -301,6 +306,16 @@ public class DrawUserPair : DrawPairBase
         {
             _ = _apiController.UserRemovePair(new(entry.UserData));
         }
-        UiSharedService.AttachToolTip("Hold CTRL and click to unpair permanently from " + entryUID);
+        UiSharedService.AttachToolTip(AppendSeenInfo("Hold CTRL and click to unpair permanently from " + entryUID));
     }
-}
+
+    private string AppendSeenInfo(string tooltip)
+    {
+        if (_pair.IsVisible) return tooltip;
+
+        var lastSeen = _serverConfigurationManager.GetNameForUid(_pair.UserData.UID);
+        if (string.IsNullOrWhiteSpace(lastSeen)) return tooltip;
+
+        return tooltip + " (Vu sous : " + lastSeen + ")";
+    }
+}

MareSynchronos/UI/Components/GroupPanel.cs

@@ -1,4 +1,4 @@
-using Dalamud.Bindings.ImGui;
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
@@ -12,11 +12,13 @@ using MareSynchronos.API.Dto.Group;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services;
+using MareSynchronos.Services.AutoDetect;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.UI.Components;
 using MareSynchronos.UI.Handlers;
 using MareSynchronos.WebAPI;
+using System;
 using System.Globalization;
 using System.Numerics;
 
@@ -31,6 +33,7 @@ internal sealed class GroupPanel
     private readonly MareConfigService _mareConfig;
     private readonly ServerConfigurationManager _serverConfigurationManager;
     private readonly CharaDataManager _charaDataManager;
+    private readonly AutoDetectRequestService _autoDetectRequestService;
     private readonly Dictionary<string, bool> _showGidForEntry = new(StringComparer.Ordinal);
     private readonly UidDisplayHandler _uidDisplayHandler;
     private readonly UiSharedService _uiShared;
@@ -40,6 +43,7 @@ internal sealed class GroupPanel
     private string _editGroupComment = string.Empty;
     private string _editGroupEntry = string.Empty;
     private bool _errorGroupCreate = false;
+    private string _errorGroupCreateMessage = string.Empty;
     private bool _errorGroupJoin;
     private bool _isPasswordValid;
     private GroupPasswordDto? _lastCreatedGroup = null;
@@ -52,12 +56,27 @@ internal sealed class GroupPanel
     private bool _showModalChangePassword;
     private bool _showModalCreateGroup;
     private bool _showModalEnterPassword;
+    private string _newSyncShellAlias = string.Empty;
+    private bool _createIsTemporary = false;
+    private int _tempSyncshellDurationHours = 24;
+    private readonly int[] _temporaryDurationOptions = new[]
+    {
+        1,
+        12,
+        24,
+        48,
+        72,
+        96,
+        120,
+        144,
+        168
+    };
     private string _syncShellPassword = string.Empty;
     private string _syncShellToJoin = string.Empty;
 
     public GroupPanel(CompactUi mainUi, UiSharedService uiShared, PairManager pairManager, ChatService chatServivce,
         UidDisplayHandler uidDisplayHandler, MareConfigService mareConfig, ServerConfigurationManager serverConfigurationManager,
-        CharaDataManager charaDataManager)
+        CharaDataManager charaDataManager, AutoDetectRequestService autoDetectRequestService)
     {
         _mainUi = mainUi;
         _uiShared = uiShared;
@@ -67,6 +86,7 @@ internal sealed class GroupPanel
         _mareConfig = mareConfig;
         _serverConfigurationManager = serverConfigurationManager;
         _charaDataManager = charaDataManager;
+        _autoDetectRequestService = autoDetectRequestService;
     }
 
     private ApiController ApiController => _uiShared.ApiController;
@@ -82,7 +102,7 @@ internal sealed class GroupPanel
     {
         var buttonSize = _uiShared.GetIconButtonSize(FontAwesomeIcon.Plus);
         ImGui.SetNextItemWidth(UiSharedService.GetWindowContentRegionWidth() - ImGui.GetWindowContentRegionMin().X - buttonSize.X);
-        ImGui.InputTextWithHint("##syncshellid", "Syncshell GID/Alias (leave empty to create)", ref _syncShellToJoin, 20);
+        ImGui.InputTextWithHint("##syncshellid", "Syncshell GID/Alias (leave empty to create)", ref _syncShellToJoin, 50);
         ImGui.SameLine(ImGui.GetWindowContentRegionMin().X + UiSharedService.GetWindowContentRegionWidth() - buttonSize.X);
 
         bool userCanJoinMoreGroups = _pairManager.GroupPairs.Count < ApiController.ServerInfo.MaxGroupsJoinedByUser;
@@ -108,6 +128,10 @@ internal sealed class GroupPanel
                 {
                     _lastCreatedGroup = null;
                     _errorGroupCreate = false;
+                    _newSyncShellAlias = string.Empty;
+                    _createIsTemporary = false;
+                    _tempSyncshellDurationHours = 24;
+                    _errorGroupCreateMessage = string.Empty;
                     _showModalCreateGroup = true;
                     ImGui.OpenPopup("Create Syncshell");
                 }
@@ -150,18 +174,97 @@ internal sealed class GroupPanel
 
         if (ImGui.BeginPopupModal("Create Syncshell", ref _showModalCreateGroup, UiSharedService.PopupWindowFlags))
         {
-            UiSharedService.TextWrapped("Press the button below to create a new Syncshell.");
+            UiSharedService.TextWrapped("Choisissez le type de Syncshell à créer.");
+            bool showPermanent = !_createIsTemporary;
+            if (ImGui.RadioButton("Permanente", showPermanent))
+            {
+                _createIsTemporary = false;
+            }
+            ImGui.SameLine();
+            if (ImGui.RadioButton("Temporaire", _createIsTemporary))
+            {
+                _createIsTemporary = true;
+                _newSyncShellAlias = string.Empty;
+        }
+
+        if (!_createIsTemporary)
+        {
+            UiSharedService.TextWrapped("Donnez un nom à votre Syncshell (optionnel) puis créez-la.");
+            ImGui.SetNextItemWidth(-1);
+            ImGui.InputTextWithHint("##syncshellalias", "Nom du Syncshell", ref _newSyncShellAlias, 50);
+        }
+        else
+        {
+            _newSyncShellAlias = string.Empty;
+        }
+
+        if (_createIsTemporary)
+        {
+            UiSharedService.TextWrapped("Durée maximale d'une Syncshell temporaire : 7 jours.");
+            if (_tempSyncshellDurationHours > 168) _tempSyncshellDurationHours = 168;
+            for (int i = 0; i < _temporaryDurationOptions.Length; i++)
+            {
+                var option = _temporaryDurationOptions[i];
+                var isSelected = _tempSyncshellDurationHours == option;
+                string label = option switch
+                {
+                    >= 24 when option % 24 == 0 => option == 24 ? "24h" : $"{option / 24}j",
+                    _ => option + "h"
+                };
+
+                if (ImGui.RadioButton(label, isSelected))
+                {
+                    _tempSyncshellDurationHours = option;
+                }
+
+                // Start a new line after every 3 buttons
+                if ((i + 1) % 3 == 0)
+                {
+                    ImGui.NewLine();
+                }
+                else
+                {
+                    ImGui.SameLine();
+                }
+            }
+
+            var expiresLocal = DateTime.Now.AddHours(_tempSyncshellDurationHours);
+            UiSharedService.TextWrapped($"Expiration le {expiresLocal:g} (heure locale).");
+        }
+
+            UiSharedService.TextWrapped("Appuyez sur le bouton ci-dessous pour créer une nouvelle Syncshell.");
             ImGui.SetNextItemWidth(200 * ImGuiHelpers.GlobalScale);
             if (ImGui.Button("Create Syncshell"))
             {
                 try
                 {
-                    _lastCreatedGroup = ApiController.GroupCreate().Result;
+                    if (_createIsTemporary)
+                    {
+                        var expiresAtUtc = DateTime.UtcNow.AddHours(_tempSyncshellDurationHours);
+                        _lastCreatedGroup = ApiController.GroupCreateTemporary(expiresAtUtc).Result;
+                    }
+                    else
+                    {
+                        var aliasInput = string.IsNullOrWhiteSpace(_newSyncShellAlias) ? null : _newSyncShellAlias.Trim();
+                        _lastCreatedGroup = ApiController.GroupCreate(aliasInput).Result;
+                        if (_lastCreatedGroup != null)
+                        {
+                            _newSyncShellAlias = string.Empty;
+                        }
+                    }
                 }
-                catch
+                catch (Exception ex)
                 {
                     _lastCreatedGroup = null;
                     _errorGroupCreate = true;
+                    if (ex.Message.Contains("name is already in use", StringComparison.OrdinalIgnoreCase))
+                    {
+                        _errorGroupCreateMessage = "Le nom de la Syncshell est déjà utilisé.";
+                    }
+                    else
+                    {
+                        _errorGroupCreateMessage = ex.Message;
+                    }
                 }
             }
 
@@ -169,6 +272,11 @@ internal sealed class GroupPanel
             {
                 ImGui.Separator();
                 _errorGroupCreate = false;
+                _errorGroupCreateMessage = string.Empty;
+                if (!string.IsNullOrWhiteSpace(_lastCreatedGroup.Group.Alias))
+                {
+                    ImGui.TextUnformatted("Syncshell Name: " + _lastCreatedGroup.Group.Alias);
+                }
                 ImGui.TextUnformatted("Syncshell ID: " + _lastCreatedGroup.Group.GID);
                 ImGui.AlignTextToFramePadding();
                 ImGui.TextUnformatted("Syncshell Password: " + _lastCreatedGroup.Password);
@@ -178,12 +286,19 @@ internal sealed class GroupPanel
                     ImGui.SetClipboardText(_lastCreatedGroup.Password);
                 }
                 UiSharedService.TextWrapped("You can change the Syncshell password later at any time.");
+                if (_lastCreatedGroup.IsTemporary && _lastCreatedGroup.ExpiresAt != null)
+                {
+                    var expiresLocal = _lastCreatedGroup.ExpiresAt.Value.ToLocalTime();
+                    UiSharedService.TextWrapped($"Cette Syncshell expirera le {expiresLocal:g} (heure locale).");
+                }
             }
 
             if (_errorGroupCreate)
             {
-                UiSharedService.ColorTextWrapped("You are already owner of the maximum amount of Syncshells (3) or joined the maximum amount of Syncshells (6). Relinquish ownership of your own Syncshells to someone else or leave existing Syncshells.",
-                    new Vector4(1, 0, 0, 1));
+                var msg = string.IsNullOrWhiteSpace(_errorGroupCreateMessage)
+                    ? "You are already owner of the maximum amount of Syncshells (3) or joined the maximum amount of Syncshells (6). Relinquish ownership of your own Syncshells to someone else or leave existing Syncshells."
+                    : _errorGroupCreateMessage;
+                UiSharedService.ColorTextWrapped(msg, new Vector4(1, 0, 0, 1));
             }
 
             UiSharedService.SetScaledWindowSize(350);
@@ -243,11 +358,13 @@ internal sealed class GroupPanel
         if (!string.Equals(_editGroupEntry, groupDto.GID, StringComparison.Ordinal))
         {
             var shellConfig = _serverConfigurationManager.GetShellConfigForGid(groupDto.GID);
-            if (!_mareConfig.Current.DisableSyncshellChat && shellConfig.Enabled)
-            {
-                ImGui.TextUnformatted($"[{shellNumber}]");
-                UiSharedService.AttachToolTip("Chat command prefix: /ss" + shellNumber);
-            }
+            var totalMembers = pairsInGroup.Count + 1;
+            var connectedMembers = pairsInGroup.Count(p => p.IsOnline) + 1;
+            var maxCapacity = ApiController.ServerInfo.MaxGroupUserCount;
+            ImGui.TextUnformatted($"{connectedMembers}/{totalMembers}");
+            UiSharedService.AttachToolTip("Membres connectés / membres totaux" + Environment.NewLine +
+                $"Capacité maximale : {maxCapacity}" + Environment.NewLine +
+                "Syncshell ID: " + groupDto.Group.GID);
             if (textIsGid) ImGui.PushFont(UiBuilder.MonoFont);
             ImGui.SameLine();
             ImGui.TextUnformatted(groupName);
@@ -255,6 +372,20 @@ internal sealed class GroupPanel
             UiSharedService.AttachToolTip("Left click to switch between GID display and comment" + Environment.NewLine +
                           "Right click to change comment for " + groupName + Environment.NewLine + Environment.NewLine
                           + "Users: " + (pairsInGroup.Count + 1) + ", Owner: " + groupDto.OwnerAliasOrUID);
+            if (groupDto.IsTemporary)
+            {
+                ImGui.SameLine();
+                UiSharedService.ColorText("(Temp)", ImGuiColors.DalamudOrange);
+                if (groupDto.ExpiresAt != null)
+                {
+                    var tempExpireLocal = groupDto.ExpiresAt.Value.ToLocalTime();
+                    UiSharedService.AttachToolTip($"Expire le {tempExpireLocal:g}");
+                }
+                else
+                {
+                    UiSharedService.AttachToolTip("Syncshell temporaire");
+                }
+            }
             if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
             {
                 var prevState = textIsGid;
@@ -438,7 +569,9 @@ internal sealed class GroupPanel
                     ).Value,
                     _uidDisplayHandler,
                     _uiShared,
-                    _charaDataManager);
+                    _charaDataManager,
+                    _autoDetectRequestService,
+                    _serverConfigurationManager);
 
                 if (pair.IsVisible)
                     visibleUsers.Add(drawPair);
@@ -464,7 +597,9 @@ internal sealed class GroupPanel
 
             if (offlineUsers.Count > 0)
             {
+                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudGrey);
                 ImGui.TextUnformatted("Offline/Unknown");
+                ImGui.PopStyleColor();
                 ImGui.Separator();
                 if (hideOfflineUsers)
                 {
@@ -497,12 +632,12 @@ internal sealed class GroupPanel
         bool showInfoIcon = !invitesEnabled || soundsDisabled || animDisabled || vfxDisabled || userSoundsDisabled || userAnimDisabled || userVFXDisabled;
 
         var lockedIcon = invitesEnabled ? FontAwesomeIcon.LockOpen : FontAwesomeIcon.Lock;
-        var animIcon = animDisabled ? FontAwesomeIcon.Stop : FontAwesomeIcon.Running;
-        var soundsIcon = soundsDisabled ? FontAwesomeIcon.VolumeOff : FontAwesomeIcon.VolumeUp;
-        var vfxIcon = vfxDisabled ? FontAwesomeIcon.Circle : FontAwesomeIcon.Sun;
-        var userAnimIcon = userAnimDisabled ? FontAwesomeIcon.Stop : FontAwesomeIcon.Running;
-        var userSoundsIcon = userSoundsDisabled ? FontAwesomeIcon.VolumeOff : FontAwesomeIcon.VolumeUp;
-        var userVFXIcon = userVFXDisabled ? FontAwesomeIcon.Circle : FontAwesomeIcon.Sun;
+        var animIcon = animDisabled ? FontAwesomeIcon.WindowClose : FontAwesomeIcon.Running;
+        var soundsIcon = soundsDisabled ? FontAwesomeIcon.VolumeMute : FontAwesomeIcon.VolumeUp;
+        var vfxIcon = vfxDisabled ? FontAwesomeIcon.TimesCircle : FontAwesomeIcon.Sun;
+        var userAnimIcon = userAnimDisabled ? FontAwesomeIcon.WindowClose : FontAwesomeIcon.Running;
+        var userSoundsIcon = userSoundsDisabled ? FontAwesomeIcon.VolumeMute : FontAwesomeIcon.VolumeUp;
+        var userVFXIcon = userVFXDisabled ? FontAwesomeIcon.TimesCircle : FontAwesomeIcon.Sun;
 
         var iconSize = UiSharedService.GetIconSize(infoIcon);
         var barbuttonSize = _uiShared.GetIconButtonSize(FontAwesomeIcon.Bars);
@@ -639,6 +774,7 @@ internal sealed class GroupPanel
                 ImGui.CloseCurrentPopup();
                 var perm = groupDto.GroupUserPermissions;
                 perm.SetDisableSounds(!perm.IsDisableSounds());
+                _mainUi.Mediator.Publish(new GroupSyncOverrideChanged(groupDto.Group.GID, perm.IsDisableSounds(), null, null));
                 _ = ApiController.GroupChangeIndividualPermissionState(new(groupDto.Group, new UserData(ApiController.UID), perm));
             }
             UiSharedService.AttachToolTip("Sets your allowance for sound synchronization for users of this syncshell."
@@ -652,6 +788,7 @@ internal sealed class GroupPanel
                 ImGui.CloseCurrentPopup();
                 var perm = groupDto.GroupUserPermissions;
                 perm.SetDisableAnimations(!perm.IsDisableAnimations());
+                _mainUi.Mediator.Publish(new GroupSyncOverrideChanged(groupDto.Group.GID, null, perm.IsDisableAnimations(), null));
                 _ = ApiController.GroupChangeIndividualPermissionState(new(groupDto.Group, new UserData(ApiController.UID), perm));
             }
             UiSharedService.AttachToolTip("Sets your allowance for animations synchronization for users of this syncshell."
@@ -666,6 +803,7 @@ internal sealed class GroupPanel
                 ImGui.CloseCurrentPopup();
                 var perm = groupDto.GroupUserPermissions;
                 perm.SetDisableVFX(!perm.IsDisableVFX());
+                _mainUi.Mediator.Publish(new GroupSyncOverrideChanged(groupDto.Group.GID, null, null, perm.IsDisableVFX()));
                 _ = ApiController.GroupChangeIndividualPermissionState(new(groupDto.Group, new UserData(ApiController.UID), perm));
             }
             UiSharedService.AttachToolTip("Sets your allowance for VFX synchronization for users of this syncshell."
@@ -700,4 +838,4 @@ internal sealed class GroupPanel
         }
         ImGui.EndChild();
     }
-}
+}

MareSynchronos/UI/Components/PairGroupsUi.cs

@@ -54,17 +54,12 @@ public class PairGroupsUi
         ImGui.SameLine(buttonPauseOffset);
         if (_uiSharedService.IconButton(pauseButton))
         {
-            // If all of the currently visible pairs (after applying filters to the pairs)
-            // are paused we display a resume button to resume all currently visible (after filters)
-            // pairs. Otherwise, we just pause all the remaining pairs.
             if (allArePaused)
             {
-                // If all are paused => resume all
                 ResumeAllPairs(availablePairsInThisTag);
             }
             else
             {
-                // otherwise pause all remaining
                 PauseRemainingPairs(availablePairsInThisTag);
             }
         }
@@ -120,7 +115,6 @@ public class PairGroupsUi
         }
         else
         {
-            // Avoid uncomfortably close group names
             if (!_tagHandler.IsTagOpen(tag))
             {
                 var size = ImGui.CalcTextSize("").Y + ImGui.GetStyle().FramePadding.Y * 2f;
@@ -157,14 +151,12 @@ public class PairGroupsUi
         {
             TagHandler.CustomUnpairedTag => "Unpaired",
             TagHandler.CustomOfflineTag => "Offline",
-            TagHandler.CustomOnlineTag => _mareConfig.Current.ShowOfflineUsersSeparately ? "Online/Paused" : "Contacts",
+            TagHandler.CustomOnlineTag => _mareConfig.Current.ShowOfflineUsersSeparately ? "Online" : "Contacts",
             TagHandler.CustomVisibleTag => "Visible",
             _ => tag
         };
 
         string resultFolderName = !isSpecialTag ? $"{displayedName} ({visible}/{online}/{total} Pairs)" : $"{displayedName} ({online} Pairs)";
-
-        //  FontAwesomeIcon.CaretSquareDown : FontAwesomeIcon.CaretSquareRight
         var icon = _tagHandler.IsTagOpen(tag) ? FontAwesomeIcon.CaretSquareDown : FontAwesomeIcon.CaretSquareRight;
         _uiSharedService.IconText(icon);
         if (ImGui.IsItemClicked(ImGuiMouseButton.Left))

MareSynchronos/UI/Components/Popup/ReportPopupHandler.cs

@@ -35,7 +35,7 @@ internal class ReportPopupHandler : IPopupHandler
         UiSharedService.TextWrapped($"Note: Sending a report will disable the offending profile globally.{Environment.NewLine}" +
             $"The report will be sent to the team of your currently connected server.{Environment.NewLine}" +
             $"Depending on the severity of the offense the users profile or account can be permanently disabled or banned.");
-        UiSharedService.ColorTextWrapped("Report spam and wrong reports will not be tolerated and can lead to permanent account suspension.", ImGuiColors.DalamudRed);
+        UiSharedService.ColorTextWrapped("Report spam and wrong reports will not be tolerated and can lead to permanent account suspension.", UiSharedService.AccentColor);
         UiSharedService.ColorTextWrapped("This is not for reporting misbehavior but solely for the actual profile. " +
             "Reports that are not solely for the profile will be ignored.", ImGuiColors.DalamudYellow);
 

MareSynchronos/UI/Components/SelectGroupForPairUi.cs

@@ -15,20 +15,8 @@ public class SelectGroupForPairUi
     private readonly UidDisplayHandler _uidDisplayHandler;
     private readonly UiSharedService _uiSharedService;
 
-    /// <summary>
-    /// The group UI is always open for a specific pair. This defines which pair the UI is open for.
-    /// </summary>
-    /// <returns></returns>
     private Pair? _pair;
-
-    /// <summary>
-    /// Should the panel show, yes/no
-    /// </summary>
     private bool _show;
-
-    /// <summary>
-    /// For the add category option, this stores the currently typed in tag name
-    /// </summary>
     private string _tagNameToAdd = "";
 
     public SelectGroupForPairUi(TagHandler tagHandler, UidDisplayHandler uidDisplayHandler, UiSharedService uiSharedService)
@@ -49,7 +37,6 @@ public class SelectGroupForPairUi
 
         var name = PairName(_pair);
         var popupName = $"Choose Groups for {name}";
-        // Is the popup supposed to show but did not open yet? Open it
         if (_show)
         {
             ImGui.OpenPopup(popupName);
@@ -91,10 +78,6 @@ public class SelectGroupForPairUi
     public void Open(Pair pair)
     {
         _pair = pair;
-        // Using "_show" here to de-couple the opening of the popup
-        // The popup name is derived from the name the user currently sees, which is
-        // based on the showUidForEntry dictionary.
-        // We'd have to derive the name here to open it popup modal here, when the Open() is called
         _show = true;
     }
 

MareSynchronos/UI/DataAnalysisUi.cs

@@ -285,7 +285,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
                         {
                             UiSharedService.ColorText("WARNING BC7 CONVERSION:", ImGuiColors.DalamudYellow);
                             ImGui.SameLine();
-                            UiSharedService.ColorText("Converting textures to BC7 is irreversible!", ImGuiColors.DalamudRed);
+                            UiSharedService.ColorText("Converting textures to BC7 is irreversible!", UiSharedService.AccentColor);
                             UiSharedService.ColorTextWrapped("- Converting textures to BC7 will reduce their size (compressed and uncompressed) drastically. It is recommended to be used for large (4k+) textures." +
                             Environment.NewLine + "- Some textures, especially ones utilizing colorsets, might not be suited for BC7 conversion and might produce visual artifacts." +
                             Environment.NewLine + "- Before converting textures, make sure to have the original files of the mod you are converting so you can reimport it in case of issues." +

MareSynchronos/UI/DownloadUi.cs

@@ -163,13 +163,13 @@ public class DownloadUi : WindowMediatorSubscriberBase
                     UiSharedService.Color(0, 0, 0, transparency), 1);
                 drawList.AddRectFilled(dlBarStart with { X = dlBarStart.X - dlBarBorder, Y = dlBarStart.Y - dlBarBorder },
                     dlBarEnd with { X = dlBarEnd.X + dlBarBorder, Y = dlBarEnd.Y + dlBarBorder },
-                    UiSharedService.Color(220, 220, 255, transparency), 1);
+                    UiSharedService.Color(230, 200, 255, transparency), 1);
                 drawList.AddRectFilled(dlBarStart, dlBarEnd,
                     UiSharedService.Color(0, 0, 0, transparency), 1);
                 var dlProgressPercent = transferredBytes / (double)totalBytes;
                 drawList.AddRectFilled(dlBarStart,
                     dlBarEnd with { X = dlBarStart.X + (float)(dlProgressPercent * dlBarWidth) },
-                    UiSharedService.Color(100, 100, 255, transparency), 1);
+                    UiSharedService.Color(160, 64, 255, transparency), 1);
 
                 if (_configService.Current.TransferBarsShowText)
                 {

MareSynchronos/UI/DtrEntry.cs

@@ -2,9 +2,11 @@
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Plugin.Services;
+using Dalamud.Interface;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.MareConfiguration.Configurations;
 using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services.AutoDetect;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.WebAPI;
 using Microsoft.Extensions.Hosting;
@@ -15,6 +17,7 @@ namespace MareSynchronos.UI;
 
 public sealed class DtrEntry : IDisposable, IHostedService
 {
+    public const string DefaultGlyph = "\u25CB";
     private enum DtrStyle
     {
         Default,
@@ -39,12 +42,13 @@ public sealed class DtrEntry : IDisposable, IHostedService
     private readonly ILogger<DtrEntry> _logger;
     private readonly MareMediator _mareMediator;
     private readonly PairManager _pairManager;
+    private readonly NearbyPendingService _nearbyPendingService;
     private Task? _runTask;
     private string? _text;
     private string? _tooltip;
     private Colors _colors;
 
-    public DtrEntry(ILogger<DtrEntry> logger, IDtrBar dtrBar, MareConfigService configService, MareMediator mareMediator, PairManager pairManager, ApiController apiController)
+    public DtrEntry(ILogger<DtrEntry> logger, IDtrBar dtrBar, MareConfigService configService, MareMediator mareMediator, PairManager pairManager, ApiController apiController, NearbyPendingService nearbyPendingService)
     {
         _logger = logger;
         _dtrBar = dtrBar;
@@ -53,6 +57,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
         _mareMediator = mareMediator;
         _pairManager = pairManager;
         _apiController = apiController;
+        _nearbyPendingService = nearbyPendingService;
     }
 
     public void Dispose()
@@ -145,8 +150,9 @@ public sealed class DtrEntry : IDisposable, IHostedService
         if (_apiController.IsConnected)
         {
             var pairCount = _pairManager.GetVisibleUserCount();
-
-            text = RenderDtrStyle(_configService.Current.DtrStyle, pairCount.ToString());
+            var baseText = RenderDtrStyle(_configService.Current.DtrStyle, pairCount.ToString());
+            var pendingNearby = _nearbyPendingService.Pending.Count;
+            text = pendingNearby > 0 ? $"{baseText} ({pendingNearby})" : baseText;
             if (pairCount > 0)
             {
                 IEnumerable<string> visiblePairs;
@@ -163,12 +169,21 @@ public sealed class DtrEntry : IDisposable, IHostedService
                         .Select(x => string.Format("{0}", _configService.Current.PreferNoteInDtrTooltip ? x.GetNoteOrName() : x.PlayerName));
                 }
 
-                tooltip = $"Umbra: Connected{Environment.NewLine}----------{Environment.NewLine}{string.Join(Environment.NewLine, visiblePairs)}";
+                tooltip = $"Umbra: Connected";
+                if (pendingNearby > 0)
+                {
+                    tooltip += $"{Environment.NewLine}Invitation en attente : {pendingNearby}";
+                }
+                tooltip += $"{Environment.NewLine}----------{Environment.NewLine}{string.Join(Environment.NewLine, visiblePairs)}";
                 colors = _configService.Current.DtrColorsPairsInRange;
             }
             else
             {
                 tooltip = "Umbra: Connected";
+                if (pendingNearby > 0)
+                {
+                    tooltip += $"{Environment.NewLine}Invitation en attente : {pendingNearby}";
+                }
                 colors = _configService.Current.DtrColorsDefault;
             }
         }
@@ -196,7 +211,8 @@ public sealed class DtrEntry : IDisposable, IHostedService
     {
         var style = (DtrStyle)styleNum;
 
-        return style switch {
+        return style switch
+        {
             DtrStyle.Style1 => $"\xE039 {text}",
             DtrStyle.Style2 => $"\xE0BC {text}",
             DtrStyle.Style3 => $"\xE0BD {text}",
@@ -206,7 +222,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
             DtrStyle.Style7 => $"\xE05D {text}",
             DtrStyle.Style8 => $"\xE03C{text}",
             DtrStyle.Style9 => $"\xE040 {text} \xE041",
-            _ => $"\uE044 {text}"
+            _ => DefaultGlyph + " " + text
         };
     }
 

MareSynchronos/UI/EditProfileUi.cs

@@ -12,6 +12,7 @@ using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.Utils;
 using MareSynchronos.WebAPI;
 using Microsoft.Extensions.Logging;
+using System.Numerics;
 
 namespace MareSynchronos.UI;
 
@@ -65,12 +66,13 @@ public class EditProfileUi : WindowMediatorSubscriberBase
     protected override void DrawInternal()
     {
         _uiSharedService.BigText("Current Profile (as saved on server)");
+        ImGuiHelpers.ScaledDummy(new Vector2(0f, ImGui.GetStyle().ItemSpacing.Y / 2));
 
         var profile = _mareProfileManager.GetMareProfile(new UserData(_apiController.UID));
 
         if (profile.IsFlagged)
         {
-            UiSharedService.ColorTextWrapped(profile.Description, ImGuiColors.DalamudRed);
+            UiSharedService.ColorTextWrapped(profile.Description, UiSharedService.AccentColor);
             return;
         }
 
@@ -87,13 +89,12 @@ public class EditProfileUi : WindowMediatorSubscriberBase
             _descriptionText = _profileDescription;
         }
 
+        var spacing = ImGui.GetStyle().ItemSpacing.X;
         if (_pfpTextureWrap != null)
         {
             ImGui.Image(_pfpTextureWrap.Handle, ImGuiHelpers.ScaledVector2(_pfpTextureWrap.Width, _pfpTextureWrap.Height));
+            ImGuiHelpers.ScaledRelativeSameLine(256, spacing);
         }
-
-        var spacing = ImGui.GetStyle().ItemSpacing.X;
-        ImGuiHelpers.ScaledRelativeSameLine(256, spacing);
         using (_uiSharedService.GameFont.Push())
         {
             var descriptionTextSize = ImGui.CalcTextSize(profile.Description, hideTextAfterDoubleHash: false, 256f);
@@ -157,7 +158,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
         UiSharedService.AttachToolTip("Clear your currently uploaded profile picture");
         if (_showFileDialogError)
         {
-            UiSharedService.ColorTextWrapped("The profile picture must be a PNG file with a maximum height and width of 256px and 250KiB size", ImGuiColors.DalamudRed);
+            UiSharedService.ColorTextWrapped("The profile picture must be a PNG file with a maximum height and width of 256px and 250KiB size", UiSharedService.AccentColor);
         }
         var isNsfw = profile.IsNSFW;
         if (ImGui.Checkbox("Profile is NSFW", ref isNsfw))
@@ -217,4 +218,4 @@ public class EditProfileUi : WindowMediatorSubscriberBase
         base.Dispose(disposing);
         _pfpTextureWrap?.Dispose();
     }
-}
+}

MareSynchronos/UI/EventViewerUI.cs

@@ -175,7 +175,7 @@ internal class EventViewerUI : WindowMediatorSubscriberBase
                 {
                     EventSeverity.Informational => new Vector4(),
                     EventSeverity.Warning => ImGuiColors.DalamudYellow,
-                    EventSeverity.Error => ImGuiColors.DalamudRed,
+                    EventSeverity.Error => UiSharedService.AccentColor,
                     _ => new Vector4()
                 };
 

MareSynchronos/UI/Handlers/UidDisplayHandler.cs

@@ -77,9 +77,21 @@ public class UidDisplayHandler
 
                 if (_popupTime > DateTime.UtcNow || !_mareConfigService.Current.ProfilesShow)
                 {
-                    ImGui.SetTooltip("Left click to switch between UID display and nick" + Environment.NewLine
+                    // Build tooltip; prepend last-seen when player is offline or not visible
+                    string tooltip = "Left click to switch between UID display and nick" + Environment.NewLine
                         + "Right click to change nick for " + pair.UserData.AliasOrUID + Environment.NewLine
-                        + "Middle Mouse Button to open their profile in a separate window");
+                        + "Middle Mouse Button to open their profile in a separate window";
+
+                    if (!pair.IsOnline || !pair.IsVisible)
+                    {
+                        var lastSeen = _serverManager.GetNameForUid(pair.UserData.UID);
+                        if (!string.IsNullOrEmpty(lastSeen))
+                        {
+                            tooltip = "Vu sous : " + lastSeen + Environment.NewLine + tooltip;
+                        }
+                    }
+
+                    ImGui.SetTooltip(tooltip);
                 }
                 else if (_popupTime < DateTime.UtcNow && !_popupShown)
                 {
@@ -142,10 +154,15 @@ public class UidDisplayHandler
 
     public (bool isUid, string text) GetPlayerText(Pair pair)
     {
-        var textIsUid = true;
         bool showUidInsteadOfName = ShowUidInsteadOfName(pair);
+        if (showUidInsteadOfName)
+        {
+            return (true, pair.UserData.UID);
+        }
+
+        var textIsUid = true;
         string? playerText = _serverManager.GetNoteForUid(pair.UserData.UID);
-        if (!showUidInsteadOfName && playerText != null)
+        if (playerText != null)
         {
             if (string.IsNullOrEmpty(playerText))
             {
@@ -161,7 +178,7 @@ public class UidDisplayHandler
             playerText = pair.UserData.AliasOrUID;
         }
 
-        if (_mareConfigService.Current.ShowCharacterNames && textIsUid && !showUidInsteadOfName)
+        if (_mareConfigService.Current.ShowCharacterNames && textIsUid && pair.IsOnline && pair.IsVisible)
         {
             var name = pair.PlayerName;
             if (name != null)
@@ -197,8 +214,11 @@ public class UidDisplayHandler
 
     private bool ShowUidInsteadOfName(Pair pair)
     {
-        _showUidForEntry.TryGetValue(pair.UserData.UID, out var showUidInsteadOfName);
+        if (_showUidForEntry.TryGetValue(pair.UserData.UID, out var showUidInsteadOfName))
+        {
+            return showUidInsteadOfName;
+        }
 
-        return showUidInsteadOfName;
+        return false;
     }
-}
+}

MareSynchronos/UI/IntroUI.cs

@@ -69,17 +69,17 @@ public partial class IntroUi : WindowMediatorSubscriberBase
         return _uiShared.ApiController.ServerState switch
         {
             ServerState.Connecting => ImGuiColors.DalamudYellow,
-            ServerState.Reconnecting => ImGuiColors.DalamudRed,
+            ServerState.Reconnecting => UiSharedService.AccentColor,
             ServerState.Connected => ImGuiColors.HealerGreen,
             ServerState.Disconnected => ImGuiColors.DalamudYellow,
             ServerState.Disconnecting => ImGuiColors.DalamudYellow,
-            ServerState.Unauthorized => ImGuiColors.DalamudRed,
-            ServerState.VersionMisMatch => ImGuiColors.DalamudRed,
-            ServerState.Offline => ImGuiColors.DalamudRed,
+            ServerState.Unauthorized => UiSharedService.AccentColor,
+            ServerState.VersionMisMatch => UiSharedService.AccentColor,
+            ServerState.Offline => UiSharedService.AccentColor,
             ServerState.RateLimited => ImGuiColors.DalamudYellow,
             ServerState.NoSecretKey => ImGuiColors.DalamudYellow,
             ServerState.MultiChara => ImGuiColors.DalamudYellow,
-            _ => ImGuiColors.DalamudRed
+            _ => UiSharedService.AccentColor
         };
     }
 
@@ -140,46 +140,46 @@ public partial class IntroUi : WindowMediatorSubscriberBase
         {
             using (_uiShared.UidFont.Push())
             {
-                ImGui.TextUnformatted("Agreement of Usage of Service");
+                ImGui.TextUnformatted("Conditions d'utilisation");
             }
 
             ImGui.Separator();
             ImGui.SetWindowFontScale(1.5f);
-            string readThis = "READ THIS CAREFULLY";
+            string readThis = "MERCI DE LIRE ATTENTIVEMENT";
             Vector2 textSize = ImGui.CalcTextSize(readThis);
             ImGui.SetCursorPosX(ImGui.GetWindowSize().X / 2 - textSize.X / 2);
-            UiSharedService.ColorText(readThis, ImGuiColors.DalamudRed);
+            UiSharedService.ColorText(readThis, UiSharedService.AccentColor);
             ImGui.SetWindowFontScale(1.0f);
             ImGui.Separator();
             UiSharedService.TextWrapped("""
-                                        To use Umbra, you must be over the age of 18, or 21 in some jurisdictions. 
+                                        Pour utiliser les services UmbraSync, vous devez être âgé de plus de 18 ans, où plus de 21 ans dans certaines juridictions.
                                         """);
             UiSharedService.TextWrapped("""
-                                        All of the mod files currently active on your character as well as your current character state will be uploaded to the service you registered yourself at automatically. The plugin will exclusively upload the necessary mod files and not the whole mod.
+                                        Tout les mods actuellement actifs sur votre personnage et ses états associés seront automatiquement téléchargés vers le serveur UmbraSync auquel vous vous êtes inscrit.Il sera téléchargé exclusivement les fichiers nécessaires à la synchronisation et non l'intégralité du mod.
                                         """);
             UiSharedService.TextWrapped("""
-                                        If you are on a data capped internet connection, higher fees due to data usage depending on the amount of downloaded and uploaded mod files might occur. Mod files will be compressed on up- and download to save on bandwidth usage. Due to varying up- and download speeds, changes in characters might not be visible immediately. Files present on the service that already represent your active mod files will not be uploaded again.
+                                        Si vous disposez d'une connexion Internet limitée, des frais supplémentaires peuvent s'appliquer en fonction du nombre de fichiers envoyés et reçus. Les fichiers seront compressés afin d'économiser la bande passante. En raison des variations de vitesse de débit, les sychronisations peuvent ne pas être visible immédiatement.
                                         """);
             UiSharedService.TextWrapped("""
-                                        The mod files you are uploading are confidential and will not be distributed to parties other than the ones who are requesting the exact same mod files. Please think about who you are going to pair since it is unavoidable that they will receive and locally cache the necessary mod files that you have currently in use. Locally cached mod files will have arbitrary file names to discourage attempts at replicating the original mod.
+                                        Les fichiers téléchargés sont confidentiels et ne seront pas distribués à des solutions tierces où autres personnes. Uniquement les personnes avec qui vous êtes appairés demandent exactement les mêmes fichiers. Réfléchissez donc bien avec qui vous allez vous appairer.
                                         """);
             UiSharedService.TextWrapped("""
-                                        The plugin creator tried their best to keep you secure. However, there is no guarantee for 100% security. Do not blindly pair your client with everyone.
+                                        Le gentil dev' a fait de son mieux pour assurer votre sécurité. Cependant le risque 0 n'existe pas. Ne vous appairez pas aveuglément avec n'importe qui.
                                         """);
             UiSharedService.TextWrapped("""
-                                        Mod files that are saved on the service will remain on the service as long as there are requests for the files from clients. After a period of not being used, the mod files will be automatically deleted.
+                                        Après une periode d'inactivité, les mods enregistrés sur le serveur UmbraSync seront automatiquement supprimés.
                                         """);
             UiSharedService.TextWrapped("""
-                                        Accounts that are inactive for ninety (90) days will be deleted for privacy reasons.
+                                        Les comptes inactifs pendant 90 jours seront supprimés pour des raisons de stockage et de confidentialité.
                                         """);
             UiSharedService.TextWrapped("""
-                                        Umbra is operated from servers located in the European Union. You agree not to upload any content to the service that violates EU law; and more specifically, German law.
+                                        L'infrastructure Umbrasync est hebergé dans l'Union Européenne (Allemagne) et en Suisse. Vous acceptez alors de ne pas télécharger de contenu qui pourrait aller à l'encontre des législations de ces deux pays.
                                         """);
             UiSharedService.TextWrapped("""
-                                        You may delete your account at any time from within the Settings panel of the plugin. Any mods unique to you will then be removed from the server within 14 days.
+                                        Vous pouvez supprimer votre compte à tout moment. Votre compte et toutes les données associées seront supprimés dans un délai de 14 jours.
                                         """);
             UiSharedService.TextWrapped("""
-                                        This service is provided as-is.
+                                        Ce service est fourni tel quel.
                                         """);
 
             ImGui.Separator();
@@ -208,7 +208,7 @@ public partial class IntroUi : WindowMediatorSubscriberBase
 
             if (!_uiShared.HasValidPenumbraModPath)
             {
-                UiSharedService.ColorTextWrapped("You do not have a valid Penumbra path set. Open Penumbra and set up a valid path for the mod directory.", ImGuiColors.DalamudRed);
+                UiSharedService.ColorTextWrapped("You do not have a valid Penumbra path set. Open Penumbra and set up a valid path for the mod directory.", UiSharedService.AccentColor);
             }
             else
             {
@@ -330,11 +330,11 @@ public partial class IntroUi : WindowMediatorSubscriberBase
             ImGui.InputText("", ref _secretKey, 64);
             if (_secretKey.Length > 0 && _secretKey.Length != 64)
             {
-                UiSharedService.ColorTextWrapped("Your secret key must be exactly 64 characters long.", ImGuiColors.DalamudRed);
+                UiSharedService.ColorTextWrapped("Your secret key must be exactly 64 characters long.", UiSharedService.AccentColor);
             }
             else if (_secretKey.Length == 64 && !HexRegex().IsMatch(_secretKey))
             {
-                UiSharedService.ColorTextWrapped("Your secret key can only contain ABCDEF and the numbers 0-9.", ImGuiColors.DalamudRed);
+                UiSharedService.ColorTextWrapped("Your secret key can only contain ABCDEF and the numbers 0-9.", UiSharedService.AccentColor);
             }
             else if (_secretKey.Length == 64)
             {

MareSynchronos/UI/PermissionWindowUI.cs

@@ -128,6 +128,10 @@ public class PermissionWindowUI : WindowMediatorSubscriberBase
         using (ImRaii.Disabled(!hasChanges))
             if (_uiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.Save, "Save"))
             {
+                Mediator.Publish(new PairSyncOverrideChanged(Pair.UserData.UID,
+                    _ownPermissions.IsDisableSounds(),
+                    _ownPermissions.IsDisableAnimations(),
+                    _ownPermissions.IsDisableVFX()));
                 _ = _apiController.UserSetPairPermissions(new(Pair.UserData, _ownPermissions));
             }
         UiSharedService.AttachToolTip("Save and apply all changes");
@@ -148,10 +152,15 @@ public class PermissionWindowUI : WindowMediatorSubscriberBase
         ImGui.SameLine();
         if (_uiSharedService.IconTextButton(Dalamud.Interface.FontAwesomeIcon.ArrowsSpin, "Reset to Default"))
         {
+            var defaults = _uiSharedService.ConfigService.Current;
             _ownPermissions.SetPaused(false);
-            _ownPermissions.SetDisableVFX(false);
-            _ownPermissions.SetDisableSounds(false);
-            _ownPermissions.SetDisableAnimations(false);
+            _ownPermissions.SetDisableSounds(defaults.DefaultDisableSounds);
+            _ownPermissions.SetDisableAnimations(defaults.DefaultDisableAnimations);
+            _ownPermissions.SetDisableVFX(defaults.DefaultDisableVfx);
+            Mediator.Publish(new PairSyncOverrideChanged(Pair.UserData.UID,
+                _ownPermissions.IsDisableSounds(),
+                _ownPermissions.IsDisableAnimations(),
+                _ownPermissions.IsDisableVFX()));
             _ = _apiController.UserSetPairPermissions(new(Pair.UserData, _ownPermissions));
         }
         UiSharedService.AttachToolTip("This will set all permissions to their default setting");

MareSynchronos/UI/PopoutProfileUi.cs

@@ -113,7 +113,7 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
                 UiSharedService.ColorText(note, ImGuiColors.DalamudGrey);
             }
             string status = _pair.IsVisible ? "Visible" : (_pair.IsOnline ? "Online" : "Offline");
-            UiSharedService.ColorText(status, (_pair.IsVisible || _pair.IsOnline) ? ImGuiColors.HealerGreen : ImGuiColors.DalamudRed);
+            UiSharedService.ColorText(status, (_pair.IsVisible || _pair.IsOnline) ? ImGuiColors.HealerGreen : UiSharedService.AccentColor);
             if (_pair.IsVisible)
             {
                 ImGui.SameLine();

MareSynchronos/UI/SettingsUi.cs

@@ -14,6 +14,7 @@ using MareSynchronos.MareConfiguration.Models;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services;
+using MareSynchronos.Services.AutoDetect;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.WebAPI;
@@ -44,12 +45,14 @@ public class SettingsUi : WindowMediatorSubscriberBase
     private readonly PairManager _pairManager;
     private readonly ChatService _chatService;
     private readonly GuiHookService _guiHookService;
+    private readonly AutoDetectSuppressionService _autoDetectSuppressionService;
     private readonly PerformanceCollectorService _performanceCollector;
     private readonly PlayerPerformanceConfigService _playerPerformanceConfigService;
     private readonly PlayerPerformanceService _playerPerformanceService;
     private readonly AccountRegistrationService _registerService;
     private readonly ServerConfigurationManager _serverConfigurationManager;
     private readonly UiSharedService _uiShared;
+    private static readonly string DtrDefaultPreviewText = DtrEntry.DefaultGlyph + " 123";
     private bool _deleteAccountPopupModalShown = false;
     private string _lastTab = string.Empty;
     private bool? _notesSuccessfullyApplied = null;
@@ -76,7 +79,8 @@ public class SettingsUi : WindowMediatorSubscriberBase
         FileCacheManager fileCacheManager,
         FileCompactor fileCompactor, ApiController apiController,
         IpcManager ipcManager, IpcProvider ipcProvider, CacheMonitor cacheMonitor,
-        DalamudUtilService dalamudUtilService, AccountRegistrationService registerService) : base(logger, mediator, "Umbra Settings", performanceCollector)
+        DalamudUtilService dalamudUtilService, AccountRegistrationService registerService,
+        AutoDetectSuppressionService autoDetectSuppressionService) : base(logger, mediator, "Umbra Settings", performanceCollector)
     {
         _configService = configService;
         _pairManager = pairManager;
@@ -95,6 +99,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         _cacheMonitor = cacheMonitor;
         _dalamudUtilService = dalamudUtilService;
         _registerService = registerService;
+        _autoDetectSuppressionService = autoDetectSuppressionService;
         _fileCompactor = fileCompactor;
         _uiShared = uiShared;
         AllowClickthrough = false;
@@ -204,12 +209,95 @@ public class SettingsUi : WindowMediatorSubscriberBase
         ImGui.AlignTextToFramePadding();
         ImGui.TextUnformatted("0 = No limit/infinite");
 
+        bool enableDownloadQueue = _configService.Current.EnableDownloadQueue;
+        if (ImGui.Checkbox("Activer la file de téléchargements", ref enableDownloadQueue))
+        {
+            _configService.Current.EnableDownloadQueue = enableDownloadQueue;
+            _configService.Save();
+        }
+        UiSharedService.AttachToolTip("Lance les téléchargements de personnages de manière séquentielle plutôt que tous en même temps. "
+            + "Quand l'option est activée, seul le nombre configuré de téléchargements fonctionne en parallèle.");
+
         ImGui.SetNextItemWidth(250 * ImGuiHelpers.GlobalScale);
         if (ImGui.SliderInt("Maximum Parallel Downloads", ref maxParallelDownloads, 1, 10))
         {
             _configService.Current.ParallelDownloads = maxParallelDownloads;
             _configService.Save();
         }
+        UiSharedService.AttachToolTip(enableDownloadQueue
+            ? "Nombre maximal de téléchargements de personnages autorisés simultanément lorsque la file est activée."
+            : "Nombre maximal de flux de fichiers lancés en parallèle pour chaque téléchargement.");
+
+        ImGui.Separator();
+        _uiShared.BigText("AutoDetect");
+        bool isAutoDetectSuppressed = _autoDetectSuppressionService?.IsSuppressed ?? false;
+        bool enableDiscovery = _configService.Current.EnableAutoDetectDiscovery;
+        using (ImRaii.Disabled(isAutoDetectSuppressed))
+        {
+            if (ImGui.Checkbox("Activer l'AutoDetect", ref enableDiscovery))
+            {
+                _configService.Current.EnableAutoDetectDiscovery = enableDiscovery;
+                _configService.Save();
+
+                // notify services of toggle
+                Mediator.Publish(new NearbyDetectionToggled(enableDiscovery));
+
+                // if Nearby is turned OFF, force Allow Pair Requests OFF as well
+                if (!enableDiscovery && _configService.Current.AllowAutoDetectPairRequests)
+                {
+                    _configService.Current.AllowAutoDetectPairRequests = false;
+                    _configService.Save();
+                    Mediator.Publish(new AllowPairRequestsToggled(false));
+                }
+            }
+            if (isAutoDetectSuppressed && ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
+            {
+                UiSharedService.AttachToolTip("AutoDetect est temporairement désactivé dans cette zone instanciée.");
+            }
+        }
+
+        // Allow Pair Requests is disabled when Nearby is OFF
+        using (ImRaii.Disabled(isAutoDetectSuppressed || !enableDiscovery))
+        {
+            bool allowRequests = _configService.Current.AllowAutoDetectPairRequests;
+            if (ImGui.Checkbox("Activer les invitations entrantes", ref allowRequests))
+            {
+                _configService.Current.AllowAutoDetectPairRequests = allowRequests;
+                _configService.Save();
+
+                // notify services of toggle
+                Mediator.Publish(new AllowPairRequestsToggled(allowRequests));
+
+                // user-facing info toast
+                Mediator.Publish(new NotificationMessage(
+                    "AutoDetect",
+                    allowRequests ? "Invitations entrantes autorisées : les autres peuvent vous inviter." : "Invitations entrantes désactivées : les autres ne peuvent pas vous inviter.",
+                    NotificationType.Info,
+                    default));
+            }
+            if (isAutoDetectSuppressed && ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
+            {
+                UiSharedService.AttachToolTip("AutoDetect est temporairement désactivé dans cette zone instanciée.");
+            }
+        }
+
+        // Radius only available when both Nearby and Allow Pair Requests are ON
+        if (!isAutoDetectSuppressed && enableDiscovery && _configService.Current.AllowAutoDetectPairRequests)
+        {
+            ImGui.Indent();
+            int maxMeters = _configService.Current.AutoDetectMaxDistanceMeters;
+            ImGui.SetNextItemWidth(200 * ImGuiHelpers.GlobalScale);
+            if (ImGui.SliderInt("Distance max (en mètre)", ref maxMeters, 5, 100))
+            {
+                _configService.Current.AutoDetectMaxDistanceMeters = maxMeters;
+                _configService.Save();
+            }
+            ImGui.Unindent();
+        }
+        else if (isAutoDetectSuppressed)
+        {
+            UiSharedService.ColorTextWrapped("AutoDetect est verrouillé tant que vous restez dans une zone instanciée.", ImGuiColors.DalamudYellow);
+        }
 
         ImGui.Separator();
         _uiShared.BigText("Transfer UI");
@@ -492,7 +580,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
             if (ImGui.Checkbox($"Enable chat for this syncshell##{gid}", ref shellEnabled))
             {
-                // If there is an active group with the same syncshell number, pick a new one
                 int nextNumber = 1;
                 bool conflict = false;
                 foreach (var otherGroup in _pairManager.Groups)
@@ -512,17 +599,13 @@ public class SettingsUi : WindowMediatorSubscriberBase
             using var pushDisabled = ImRaii.Disabled(!shellEnabled);
 
             ImGui.SetNextItemWidth(50 * ImGuiHelpers.GlobalScale);
-
-            // _uiShared.DrawCombo() remembers the selected option -- we don't want that, because the value can change
             if (ImGui.BeginCombo("Syncshell number##{gid}", $"{shellNumber}"))
             {
-                // Same hard-coded number in CommandManagerService
                 for (int i = 1; i <= ChatService.CommandMaxNumber; ++i)
                 {
                     if (ImGui.Selectable($"{i}", i == shellNumber))
                     {
-                        // Find an active group with the same syncshell number as selected, and swap it
-                        // This logic can leave duplicate IDs present in the config but its not critical
+
                         foreach (var otherGroup in _pairManager.Groups)
                         {
                             if (gid.Equals(otherGroup.Key.GID, StringComparison.Ordinal)) continue;
@@ -597,7 +680,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
             ImGui.SameLine(300.0f * ImGuiHelpers.GlobalScale);
             if (_ipcProvider.ImpersonationActive)
             {
-                UiSharedService.ColorTextWrapped("Umbra API active!", ImGuiColors.HealerGreen);
+                UiSharedService.ColorTextWrapped("Umbra API active!", UiSharedService.AccentColor);
             }
             else
             {
@@ -606,7 +689,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 else if (_ipcProvider.MarePluginEnabled)
                     UiSharedService.ColorTextWrapped("Umbra API inactive: Umbra plugin is loaded", ImGuiColors.DalamudYellow);
                 else
-                    UiSharedService.ColorTextWrapped("Umbra API inactive: Unknown reason", ImGuiColors.DalamudRed);
+                    UiSharedService.ColorTextWrapped("Umbra API inactive: Unknown reason", UiSharedService.AccentColor);
             }
         }
 
@@ -936,11 +1019,11 @@ public class SettingsUi : WindowMediatorSubscriberBase
         _uiShared.DrawHelpText("If this option is selected all already existing notes for UIDs will be overwritten by the imported notes.");
         if (_notesSuccessfullyApplied.HasValue && _notesSuccessfullyApplied.Value)
         {
-            UiSharedService.ColorTextWrapped("User Notes successfully imported", ImGuiColors.HealerGreen);
+            UiSharedService.ColorTextWrapped("User Notes successfully imported", UiSharedService.AccentColor);
         }
         else if (_notesSuccessfullyApplied.HasValue && !_notesSuccessfullyApplied.Value)
         {
-            UiSharedService.ColorTextWrapped("Attempt to import notes from clipboard failed. Check formatting and try again", ImGuiColors.DalamudRed);
+            UiSharedService.ColorTextWrapped("Attempt to import notes from clipboard failed. Check formatting and try again", UiSharedService.AccentColor);
         }
 
         var openPopupOnAddition = _configService.Current.OpenPopupOnAdd;
@@ -999,13 +1082,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 _configService.Save();
             }
 
-            ImGui.SetNextItemWidth(250 * ImGuiHelpers.GlobalScale);
-            _uiShared.DrawCombo("Server Info Bar style", Enumerable.Range(0, DtrEntry.NumStyles), (i) => DtrEntry.RenderDtrStyle(i, "123"),
-            (i) =>
-            {
-                _configService.Current.DtrStyle = i;
-                _configService.Save();
-            }, _configService.Current.DtrStyle);
+            DrawDtrStyleCombo();
 
             if (ImGui.Checkbox("Color-code the Server Info Bar entry according to status", ref useColorsInDtr))
             {
@@ -1041,7 +1118,9 @@ public class SettingsUi : WindowMediatorSubscriberBase
         var useNameColors = _configService.Current.UseNameColors;
         var nameColors = _configService.Current.NameColors;
         var autoPausedNameColors = _configService.Current.BlockedNameColors;
-        if (ImGui.Checkbox("Color nameplates of paired players", ref useNameColors))
+        var typingIndicatorNameplates = _configService.Current.TypingIndicatorShowOnNameplates;
+        var typingIndicatorPartyList = _configService.Current.TypingIndicatorShowOnPartyList;
+        if (ImGui.Checkbox("Coloriser les plaques de nom des paires", ref useNameColors))
         {
             _configService.Current.UseNameColors = useNameColors;
             _configService.Save();
@@ -1051,7 +1130,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
         using (ImRaii.Disabled(!useNameColors))
         {
             using var indent = ImRaii.PushIndent();
-            if (InputDtrColors("Character Name Color", ref nameColors))
+            if (InputDtrColors("Couleur du nom", ref nameColors))
             {
                 _configService.Current.NameColors = nameColors;
                 _configService.Save();
@@ -1060,7 +1139,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
             ImGui.SameLine();
 
-            if (InputDtrColors("Blocked Character Color", ref autoPausedNameColors))
+            if (InputDtrColors("Couleur des noms bloqués", ref autoPausedNameColors))
             {
                 _configService.Current.BlockedNameColors = autoPausedNameColors;
                 _configService.Save();
@@ -1068,6 +1147,43 @@ public class SettingsUi : WindowMediatorSubscriberBase
             }
         }
 
+        if (ImGui.Checkbox("Afficher la bulle de frappe sur les plaques", ref typingIndicatorNameplates))
+        {
+            _configService.Current.TypingIndicatorShowOnNameplates = typingIndicatorNameplates;
+            _configService.Save();
+        }
+        _uiShared.DrawHelpText("Ajoute une bulle '...' sur la plaque des paires en train d'écrire.");
+
+        using (ImRaii.Disabled(!typingIndicatorNameplates))
+        {
+            using var indentTyping = ImRaii.PushIndent();
+            var bubbleSize = _configService.Current.TypingIndicatorBubbleSize;
+            TypingIndicatorBubbleSize? selectedBubbleSize = _uiShared.DrawCombo("Taille de la bulle de frappe##typingBubbleSize",
+                Enum.GetValues<TypingIndicatorBubbleSize>(),
+                size => size switch
+                {
+                    TypingIndicatorBubbleSize.Small => "Petite",
+                    TypingIndicatorBubbleSize.Medium => "Moyenne",
+                    TypingIndicatorBubbleSize.Large => "Grande",
+                    _ => size.ToString()
+                },
+                null,
+                bubbleSize);
+
+            if (selectedBubbleSize.HasValue && selectedBubbleSize.Value != bubbleSize)
+            {
+                _configService.Current.TypingIndicatorBubbleSize = selectedBubbleSize.Value;
+                _configService.Save();
+            }
+        }
+
+        if (ImGui.Checkbox("Tracer la frappe dans la liste de groupe", ref typingIndicatorPartyList))
+        {
+            _configService.Current.TypingIndicatorShowOnPartyList = typingIndicatorPartyList;
+            _configService.Save();
+        }
+        _uiShared.DrawHelpText("Consigne dans les journaux quand une paire du groupe est en train d'écrire (bulle visuelle ultérieure).");
+
         if (ImGui.Checkbox("Show separate Visible group", ref showVisibleSeparate))
         {
             _configService.Current.ShowVisibleUsersSeparately = showVisibleSeparate;
@@ -1212,6 +1328,14 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
         _uiShared.BigText("Global Configuration");
 
+        bool showSelfAnalysisWarnings = _playerPerformanceConfigService.Current.ShowSelfAnalysisWarnings;
+        if (ImGui.Checkbox("Display self-analysis warnings", ref showSelfAnalysisWarnings))
+        {
+            _playerPerformanceConfigService.Current.ShowSelfAnalysisWarnings = showSelfAnalysisWarnings;
+            _playerPerformanceConfigService.Save();
+        }
+        _uiShared.DrawHelpText("Disable to suppress UmbraSync chat warnings when your character exceeds the self-analysis thresholds.");
+
         bool alwaysShrinkTextures = _playerPerformanceConfigService.Current.TextureShrinkMode == TextureShrinkMode.Always;
         bool deleteOriginalTextures = _playerPerformanceConfigService.Current.TextureShrinkDeleteOriginal;
 
@@ -1255,9 +1379,9 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
         ImGui.TextUnformatted("Current VRAM utilization by all nearby players:");
         ImGui.SameLine();
-        using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.HealerGreen, totalVramBytes < 2.0 * 1024.0 * 1024.0 * 1024.0))
+        using (ImRaii.PushColor(ImGuiCol.Text, UiSharedService.AccentColor, totalVramBytes < 2.0 * 1024.0 * 1024.0 * 1024.0))
             using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow, totalVramBytes >= 4.0 * 1024.0 * 1024.0 * 1024.0))
-                using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed, totalVramBytes >= 6.0 * 1024.0 * 1024.0 * 1024.0))
+                using (ImRaii.PushColor(ImGuiCol.Text, UiSharedService.AccentColor, totalVramBytes >= 6.0 * 1024.0 * 1024.0 * 1024.0))
                     ImGui.TextUnformatted($"{totalVramBytes / 1024.0 / 1024.0 / 1024.0:0.00} GiB");
 
         ImGui.Separator();
@@ -1610,8 +1734,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
                         string selectedKeyName = string.Empty;
                         if (selectedServer.SecretKeys.TryGetValue(item.SecretKeyIdx, out var selectedKey))
                             selectedKeyName = selectedKey.FriendlyName;
-
-                        // _uiShared.DrawCombo() remembers the selected option -- we don't want that, because the value can change
                         if (ImGui.BeginCombo($"##{item.CharacterName}{i}", selectedKeyName))
                         {
                             foreach (var key in selectedServer.SecretKeys)
@@ -1848,11 +1970,11 @@ public class SettingsUi : WindowMediatorSubscriberBase
         {
             ImGui.TextUnformatted("Service " + _serverConfigurationManager.CurrentServer!.ServerName + ":");
             ImGui.SameLine();
-            ImGui.TextColored(ImGuiColors.ParsedGreen, "Available");
+            ImGui.TextColored(UiSharedService.AccentColor, "Available");
             ImGui.SameLine();
             ImGui.TextUnformatted("(");
             ImGui.SameLine();
-            ImGui.TextColored(ImGuiColors.ParsedGreen, _apiController.OnlineUsers.ToString(CultureInfo.InvariantCulture));
+            ImGui.TextColored(UiSharedService.AccentColor, _apiController.OnlineUsers.ToString(CultureInfo.InvariantCulture));
             ImGui.SameLine();
             ImGui.TextUnformatted("Users Online");
             ImGui.SameLine();
@@ -1861,6 +1983,11 @@ public class SettingsUi : WindowMediatorSubscriberBase
         ImGui.Separator();
         if (ImGui.BeginTabBar("mainTabBar"))
         {
+            var accent = UiSharedService.AccentColor;
+            var accentColor = ImGui.ColorConvertFloat4ToU32(accent);
+            ImGui.PushStyleColor(ImGuiCol.TabActive, accentColor);
+            ImGui.PushStyleColor(ImGuiCol.TabHovered, accentColor);
+
             if (ImGui.BeginTabItem("General"))
             {
                 DrawGeneral();
@@ -1890,13 +2017,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 ImGui.BeginDisabled(_registrationInProgress);
                 DrawServerConfiguration();
                 ImGui.EndTabItem();
-                ImGui.EndDisabled(); // _registrationInProgress
-            }
-
-            if (ImGui.BeginTabItem("Chat"))
-            {
-                DrawChatConfig();
-                ImGui.EndTabItem();
+                ImGui.EndDisabled();
             }
 
             if (ImGui.BeginTabItem("Advanced"))
@@ -1904,11 +2025,44 @@ public class SettingsUi : WindowMediatorSubscriberBase
                 DrawAdvanced();
                 ImGui.EndTabItem();
             }
+            ImGui.PopStyleColor(2);
 
             ImGui.EndTabBar();
         }
     }
 
+    private void DrawDtrStyleCombo()
+    {
+        var styleIndex = _configService.Current.DtrStyle;
+        string previewText = styleIndex == 0 ? DtrDefaultPreviewText : DtrEntry.RenderDtrStyle(styleIndex, "123");
+
+        ImGui.SetNextItemWidth(250 * ImGuiHelpers.GlobalScale);
+        bool comboOpen = ImGui.BeginCombo("Server Info Bar style", previewText);
+
+        if (comboOpen)
+        {
+            for (int i = 0; i < DtrEntry.NumStyles; i++)
+            {
+                string label = i == 0 ? DtrDefaultPreviewText : DtrEntry.RenderDtrStyle(i, "123");
+                bool isSelected = i == styleIndex;
+                if (ImGui.Selectable(label, isSelected))
+                {
+                    _configService.Current.DtrStyle = i;
+                    _configService.Save();
+                }
+
+                if (isSelected)
+                {
+                    ImGui.SetItemDefaultFocus();
+                }
+
+            }
+
+            ImGui.EndCombo();
+        }
+
+    }
+
     private void UiSharedService_GposeEnd()
     {
         IsOpen = _wasOpen;

MareSynchronos/UI/StandaloneProfileUi.cs

@@ -111,7 +111,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
                 UiSharedService.ColorText(note, ImGuiColors.DalamudGrey);
             }
             string status = Pair.IsVisible ? "Visible" : (Pair.IsOnline ? "Online" : "Offline");
-            UiSharedService.ColorText(status, (Pair.IsVisible || Pair.IsOnline) ? ImGuiColors.HealerGreen : ImGuiColors.DalamudRed);
+            UiSharedService.ColorText(status, (Pair.IsVisible || Pair.IsOnline) ? ImGuiColors.HealerGreen : UiSharedService.AccentColor);
             if (Pair.IsVisible)
             {
                 ImGui.SameLine();

MareSynchronos/UI/SyncshellAdminUI.cs

@@ -374,7 +374,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
                 ImGui.TextUnformatted("Sound Sync");
                 _uiSharedService.BooleanToColoredIcon(!isDisableSounds);
                 ImGui.SameLine(230);
-                if (_uiSharedService.IconTextButton(isDisableSounds ? FontAwesomeIcon.VolumeUp : FontAwesomeIcon.VolumeMute,
+                if (_uiSharedService.IconTextButton(isDisableSounds ? FontAwesomeIcon.VolumeMute : FontAwesomeIcon.VolumeUp,
                     isDisableSounds ? "Enable sound sync" : "Disable sound sync"))
                 {
                     perm.SetDisableSounds(!perm.IsDisableSounds());
@@ -385,7 +385,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
                 ImGui.TextUnformatted("Animation Sync");
                 _uiSharedService.BooleanToColoredIcon(!isDisableAnimations);
                 ImGui.SameLine(230);
-                if (_uiSharedService.IconTextButton(isDisableAnimations ? FontAwesomeIcon.Running : FontAwesomeIcon.Stop,
+                if (_uiSharedService.IconTextButton(isDisableAnimations ? FontAwesomeIcon.WindowClose : FontAwesomeIcon.Running,
                     isDisableAnimations ? "Enable animation sync" : "Disable animation sync"))
                 {
                     perm.SetDisableAnimations(!perm.IsDisableAnimations());
@@ -396,7 +396,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
                 ImGui.TextUnformatted("VFX Sync");
                 _uiSharedService.BooleanToColoredIcon(!isDisableVfx);
                 ImGui.SameLine(230);
-                if (_uiSharedService.IconTextButton(isDisableVfx ? FontAwesomeIcon.Sun : FontAwesomeIcon.Circle,
+                if (_uiSharedService.IconTextButton(isDisableVfx ? FontAwesomeIcon.TimesCircle : FontAwesomeIcon.Sun,
                     isDisableVfx ? "Enable VFX sync" : "Disable VFX sync"))
                 {
                     perm.SetDisableVFX(!perm.IsDisableVFX());

MareSynchronos/UI/TypingIndicatorOverlay.cs

@@ -0,0 +1,533 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Linq;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Interface.Utility;
+using Dalamud.Plugin.Services;
+using MareSynchronos.API.Data;
+using MareSynchronos.API.Data.Extensions;
+using MareSynchronos.MareConfiguration;
+using MareSynchronos.MareConfiguration.Models;
+using MareSynchronos.PlayerData.Pairs;
+using MareSynchronos.Services;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.WebAPI;
+using Microsoft.Extensions.Logging;
+using Dalamud.Interface.Textures.TextureWraps;
+using FFXIVClientStructs.Interop;
+using FFXIVClientStructs.FFXIV.Client.System.Framework;
+using FFXIVClientStructs.FFXIV.Client.UI;
+using FFXIVClientStructs.FFXIV.Component.GUI;
+
+namespace MareSynchronos.UI;
+
+public sealed class TypingIndicatorOverlay : WindowMediatorSubscriberBase
+{
+    private const int NameplateIconId = 61397;
+    private static readonly TimeSpan TypingDisplayTime = TimeSpan.FromSeconds(2);
+    private static readonly TimeSpan TypingDisplayDelay = TimeSpan.FromMilliseconds(500);
+    private static readonly TimeSpan TypingDisplayFade = TypingDisplayTime;
+
+    private readonly ILogger<TypingIndicatorOverlay> _logger;
+    private readonly MareConfigService _configService;
+    private readonly IGameGui _gameGui;
+    private readonly ITextureProvider _textureProvider;
+    private readonly IClientState _clientState;
+    private readonly PairManager _pairManager;
+    private readonly IPartyList _partyList;
+    private readonly IObjectTable _objectTable;
+    private readonly DalamudUtilService _dalamudUtil;
+    private readonly TypingIndicatorStateService _typingStateService;
+    private readonly ApiController _apiController;
+
+    public TypingIndicatorOverlay(ILogger<TypingIndicatorOverlay> logger, MareMediator mediator, PerformanceCollectorService performanceCollectorService,
+        MareConfigService configService, IGameGui gameGui, ITextureProvider textureProvider, IClientState clientState,
+        IPartyList partyList, IObjectTable objectTable, DalamudUtilService dalamudUtil, PairManager pairManager,
+        TypingIndicatorStateService typingStateService, ApiController apiController)
+        : base(logger, mediator, nameof(TypingIndicatorOverlay), performanceCollectorService)
+    {
+        _logger = logger;
+        _configService = configService;
+        _gameGui = gameGui;
+        _textureProvider = textureProvider;
+        _clientState = clientState;
+        _partyList = partyList;
+        _objectTable = objectTable;
+        _dalamudUtil = dalamudUtil;
+        _pairManager = pairManager;
+        _typingStateService = typingStateService;
+        _apiController = apiController;
+
+        RespectCloseHotkey = false;
+        IsOpen = true;
+        Flags |= ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoFocusOnAppearing
+            | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoNav;
+    }
+
+    protected override void DrawInternal()
+    {
+        var viewport = ImGui.GetMainViewport();
+        ImGuiHelpers.ForceNextWindowMainViewport();
+        ImGui.SetWindowPos(viewport.Pos);
+        ImGui.SetWindowSize(viewport.Size);
+
+        if (!_clientState.IsLoggedIn)
+            return;
+
+        var showParty = _configService.Current.TypingIndicatorShowOnPartyList;
+        var showNameplates = _configService.Current.TypingIndicatorShowOnNameplates;
+
+        if (!showParty && !showNameplates)
+            return;
+
+        var overlayDrawList = ImGui.GetWindowDrawList();
+        var activeTypers = _typingStateService.GetActiveTypers(TypingDisplayTime);
+        var hasSelf = _typingStateService.TryGetSelfTyping(TypingDisplayTime, out var selfStart, out var selfLast);
+        var now = DateTime.UtcNow;
+
+        if (showParty)
+        {
+            DrawPartyIndicators(overlayDrawList, activeTypers, hasSelf, now, selfStart, selfLast);
+        }
+
+        if (showNameplates)
+        {
+            DrawNameplateIndicators(ImGui.GetWindowDrawList(), activeTypers, hasSelf, now, selfStart, selfLast);
+        }
+    }
+
+    private unsafe void DrawPartyIndicators(ImDrawListPtr drawList, IReadOnlyDictionary<string, (UserData User, DateTime FirstSeen, DateTime LastUpdate)> activeTypers,
+        bool selfActive, DateTime now, DateTime selfStart, DateTime selfLast)
+    {
+        var partyAddon = (AtkUnitBase*)_gameGui.GetAddonByName("_PartyList", 1).Address;
+        if (partyAddon == null || !partyAddon->IsVisible)
+            return;
+
+        if (selfActive
+            && (now - selfStart) >= TypingDisplayDelay
+            && (now - selfLast) <= TypingDisplayFade)
+        {
+            DrawPartyMemberTyping(drawList, partyAddon, 0);
+        }
+
+        foreach (var (uid, entry) in activeTypers)
+        {
+            if ((now - entry.LastUpdate) > TypingDisplayFade)
+                continue;
+
+            var pair = _pairManager.GetPairByUID(uid);
+            var targetIndex = -1;
+            var playerName = pair?.PlayerName;
+            var objectId = pair?.PlayerCharacterId ?? uint.MaxValue;
+
+            if (objectId != 0 && objectId != uint.MaxValue)
+            {
+                targetIndex = GetPartyIndexForObjectId(objectId);
+                if (targetIndex >= 0 && !string.IsNullOrEmpty(playerName))
+                {
+                    var member = _partyList[targetIndex];
+                    var memberName = member?.Name?.TextValue;
+                    if (!string.IsNullOrEmpty(memberName) && !memberName.Equals(playerName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        var nameIndex = GetPartyIndexForName(playerName);
+                        targetIndex = nameIndex;
+                    }
+                }
+            }
+
+            if (targetIndex < 0 && !string.IsNullOrEmpty(playerName))
+            {
+                targetIndex = GetPartyIndexForName(playerName);
+            }
+
+            if (targetIndex < 0)
+                continue;
+
+            DrawPartyMemberTyping(drawList, partyAddon, targetIndex);
+        }
+    }
+
+    private unsafe void DrawPartyMemberTyping(ImDrawListPtr drawList, AtkUnitBase* partyList, int memberIndex)
+    {
+        if (memberIndex < 0 || memberIndex > 7) return;
+
+        var nodeIndex = 23 - memberIndex;
+        if (partyList->UldManager.NodeListCount <= nodeIndex) return;
+
+        var memberNode = (AtkComponentNode*)partyList->UldManager.NodeList[nodeIndex];
+        if (memberNode == null || !memberNode->AtkResNode.IsVisible()) return;
+
+        var iconNode = memberNode->Component->UldManager.NodeListCount > 4 ? memberNode->Component->UldManager.NodeList[4] : null;
+        if (iconNode == null) return;
+
+        var align = partyList->UldManager.NodeList[3]->Y;
+        var partyScale = partyList->Scale;
+
+        var iconOffset = new Vector2(-14, 8) * partyScale;
+        var iconSize = new Vector2(iconNode->Width / 2f, iconNode->Height / 2f) * partyScale;
+
+        var iconPos = new Vector2(
+            partyList->X + (memberNode->AtkResNode.X * partyScale) + (iconNode->X * partyScale) + (iconNode->Width * partyScale / 2f),
+            partyList->Y + align + (memberNode->AtkResNode.Y * partyScale) + (iconNode->Y * partyScale) + (iconNode->Height * partyScale / 2f));
+
+        iconPos += iconOffset;
+
+        var texture = _textureProvider.GetFromGame("ui/uld/charamake_dataimport.tex").GetWrapOrEmpty();
+        if (texture == null) return;
+
+        drawList.AddImage(texture.Handle, iconPos, iconPos + iconSize, Vector2.Zero, Vector2.One,
+            ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 1f, 1f, 0.9f)));
+    }
+
+    private unsafe void DrawNameplateIndicators(ImDrawListPtr drawList, IReadOnlyDictionary<string, (UserData User, DateTime FirstSeen, DateTime LastUpdate)> activeTypers,
+        bool selfActive, DateTime now, DateTime selfStart, DateTime selfLast)
+    {
+        var iconWrap = _textureProvider.GetFromGameIcon(NameplateIconId).GetWrapOrEmpty();
+        if (iconWrap == null || iconWrap.Handle == IntPtr.Zero)
+            return;
+
+        if (selfActive
+            && _clientState.LocalPlayer != null
+            && (now - selfStart) >= TypingDisplayDelay
+            && (now - selfLast) <= TypingDisplayFade)
+        {
+            var selfId = GetEntityId(_clientState.LocalPlayer.Address);
+            if (selfId != 0 && !TryDrawNameplateBubble(drawList, iconWrap, selfId))
+            {
+                DrawWorldFallbackIcon(drawList, iconWrap, _clientState.LocalPlayer.Position);
+            }
+        }
+
+        foreach (var (uid, entry) in activeTypers)
+        {
+            if ((now - entry.LastUpdate) > TypingDisplayFade)
+                continue;
+
+            if (string.Equals(uid, _apiController.UID, StringComparison.Ordinal))
+                continue;
+
+            var pair = _pairManager.GetPairByUID(uid);
+            var objectId = pair?.PlayerCharacterId ?? 0;
+            var pairName = pair?.PlayerName ?? entry.User.AliasOrUID ?? string.Empty;
+            var pairIdent = pair?.Ident ?? string.Empty;
+            var isPartyMember = IsPartyMember(objectId, pairName);
+            var isRelevantMember = IsPlayerRelevant(pair, isPartyMember);
+
+            if (objectId != uint.MaxValue && objectId != 0 && TryDrawNameplateBubble(drawList, iconWrap, objectId))
+            {
+                _logger.LogTrace("TypingIndicator: drew nameplate bubble for {uid} (objectId={objectId})", uid, objectId);
+                continue;
+            }
+
+            var hasWorldPosition = TryResolveWorldPosition(pair, entry.User, objectId, out var worldPos);
+            var isNearby = hasWorldPosition && IsWithinRelevantDistance(worldPos);
+
+            if (!isRelevantMember && !isNearby)
+                continue;
+
+            if (pair == null)
+            {
+                _logger.LogTrace("TypingIndicator: no pair found for {uid}, attempting fallback", uid);
+            }
+
+            _logger.LogTrace("TypingIndicator: fallback draw for {uid} (objectId={objectId}, name={name}, ident={ident})",
+                uid, objectId, pairName, pairIdent);
+
+            if (hasWorldPosition)
+            {
+                DrawWorldFallbackIcon(drawList, iconWrap, worldPos);
+                _logger.LogTrace("TypingIndicator: fallback world draw for {uid} at {pos}", uid, worldPos);
+            }
+            else
+            {
+                _logger.LogTrace("TypingIndicator: could not resolve position for {uid}", uid);
+            }
+        }
+    }
+
+    private Vector2 GetConfiguredBubbleSize(float scaleX, float scaleY, bool isNameplateVisible, TypingIndicatorBubbleSize? overrideSize = null)
+    {
+        var sizeSetting = overrideSize ?? _configService.Current.TypingIndicatorBubbleSize;
+        var baseSize = sizeSetting switch
+        {
+            TypingIndicatorBubbleSize.Small when isNameplateVisible => 32f,
+            TypingIndicatorBubbleSize.Medium when isNameplateVisible => 44f,
+            TypingIndicatorBubbleSize.Large when isNameplateVisible => 56f,
+            TypingIndicatorBubbleSize.Small => 15f,
+            TypingIndicatorBubbleSize.Medium => 25f,
+            TypingIndicatorBubbleSize.Large => 35f,
+            _ => 35f,
+        };
+
+        return new Vector2(baseSize * scaleX, baseSize * scaleY);
+    }
+
+    private unsafe bool TryDrawNameplateBubble(ImDrawListPtr drawList, IDalamudTextureWrap textureWrap, uint objectId)
+    {
+        if (textureWrap == null || textureWrap.Handle == IntPtr.Zero)
+            return false;
+
+        var framework = Framework.Instance();
+        if (framework == null)
+            return false;
+
+        var ui3D = framework->GetUIModule()->GetUI3DModule();
+        if (ui3D == null)
+            return false;
+
+        var addonNamePlate = (AddonNamePlate*)_gameGui.GetAddonByName("NamePlate", 1).Address;
+        if (addonNamePlate == null)
+            return false;
+
+        AddonNamePlate.NamePlateObject* namePlate = null;
+        float distance = 0f;
+
+        for (var i = 0; i < ui3D->NamePlateObjectInfoCount; i++)
+        {
+            var objectInfo = ui3D->NamePlateObjectInfoPointers[i];
+            if (objectInfo.Value == null || objectInfo.Value->GameObject == null)
+                continue;
+
+            if (objectInfo.Value->GameObject->EntityId != objectId)
+                continue;
+
+            if (objectInfo.Value->GameObject->YalmDistanceFromPlayerX > 35f)
+                return false;
+
+            namePlate = &addonNamePlate->NamePlateObjectArray[objectInfo.Value->NamePlateIndex];
+            distance = objectInfo.Value->GameObject->YalmDistanceFromPlayerX;
+            break;
+        }
+
+        if (namePlate == null || namePlate->RootComponentNode == null)
+            return false;
+
+        var iconNode = namePlate->RootComponentNode->Component->UldManager.NodeList[0];
+        if (iconNode == null)
+            return false;
+
+        var scaleX = namePlate->RootComponentNode->AtkResNode.ScaleX;
+        var scaleY = namePlate->RootComponentNode->AtkResNode.ScaleY;
+        var iconVisible = iconNode->IsVisible();
+        var sizeScaleFactor = 1f;
+        var scaleVector = new Vector2(scaleX, scaleY);
+        var rootPosition = new Vector2(namePlate->RootComponentNode->AtkResNode.X, namePlate->RootComponentNode->AtkResNode.Y);
+        var iconLocalPosition = new Vector2(iconNode->X, iconNode->Y) * scaleVector;
+        var iconDimensions = new Vector2(iconNode->Width, iconNode->Height) * scaleVector;
+
+        if (!iconVisible)
+        {
+            sizeScaleFactor = 2.5f;
+            var anchor = rootPosition + iconLocalPosition + new Vector2(iconDimensions.X * 0.5f, 0f);
+
+            var distanceOffset = new Vector2(0f, -16f + distance) * scaleVector;
+            if (iconNode->Height == 24)
+            {
+                distanceOffset.Y += 16f * scaleY;
+            }
+            distanceOffset.Y += 64f * scaleY;
+
+            var referenceSize = GetConfiguredBubbleSize(scaleX * sizeScaleFactor, scaleY * sizeScaleFactor, false, TypingIndicatorBubbleSize.Small);
+            var manualOffset = new Vector2(referenceSize.X * 2.00f, referenceSize.Y * 2.00f);
+
+            var iconSizeHidden = GetConfiguredBubbleSize(scaleX * sizeScaleFactor, scaleY * sizeScaleFactor, false);
+            var center = anchor + distanceOffset + manualOffset;
+            var topLeft = center - (iconSizeHidden / 2f);
+
+            drawList.AddImage(textureWrap.Handle, topLeft, topLeft + iconSizeHidden, Vector2.Zero, Vector2.One,
+                ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 1f, 1f, 0.95f)));
+
+            return true;
+        }
+
+        var iconPos = rootPosition + iconLocalPosition + new Vector2(iconDimensions.X, 0f);
+
+        var iconOffset = new Vector2(distance / 1.5f, distance / 3.5f) * scaleVector;
+        if (iconNode->Height == 24)
+        {
+            iconOffset.Y -= 8f * scaleY;
+        }
+
+        iconPos += iconOffset;
+
+        var iconSize = GetConfiguredBubbleSize(scaleX * sizeScaleFactor, scaleY * sizeScaleFactor, true);
+
+        drawList.AddImage(textureWrap.Handle, iconPos, iconPos + iconSize, Vector2.Zero, Vector2.One,
+            ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 1f, 1f, 0.95f)));
+
+        return true;
+    }
+
+    private void DrawWorldFallbackIcon(ImDrawListPtr drawList, IDalamudTextureWrap textureWrap, Vector3 worldPosition)
+    {
+        var offsetPosition = worldPosition + new Vector3(0f, 1.8f, 0f);
+        if (!_gameGui.WorldToScreen(offsetPosition, out var screenPos))
+            return;
+
+        var iconSize = GetConfiguredBubbleSize(ImGuiHelpers.GlobalScale, ImGuiHelpers.GlobalScale, false);
+        var iconPos = screenPos - (iconSize / 2f) - new Vector2(0f, iconSize.Y * 0.6f);
+        drawList.AddImage(textureWrap.Handle, iconPos, iconPos + iconSize, Vector2.Zero, Vector2.One,
+            ImGui.ColorConvertFloat4ToU32(new Vector4(1f, 1f, 1f, 0.95f)));
+    }
+
+    private bool TryGetWorldPosition(uint objectId, out Vector3 position)
+    {
+        position = Vector3.Zero;
+        if (objectId == 0 || objectId == uint.MaxValue)
+            return false;
+
+        foreach (var obj in _objectTable)
+        {
+            if (obj?.EntityId == objectId)
+            {
+                position = obj.Position;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private bool TryResolveWorldPosition(Pair? pair, UserData userData, uint objectId, out Vector3 position)
+    {
+        if (TryGetWorldPosition(objectId, out position))
+        {
+            _logger.LogTrace("TypingIndicator: resolved by objectId {objectId}", objectId);
+            return true;
+        }
+
+        if (pair != null)
+        {
+            var name = pair.PlayerName;
+            if (!string.IsNullOrEmpty(name) && TryGetWorldPositionByName(name!, out position))
+            {
+                _logger.LogTrace("TypingIndicator: resolved by pair name {name}", name);
+                return true;
+            }
+
+            var ident = pair.Ident;
+            if (!string.IsNullOrEmpty(ident))
+            {
+                var cached = _dalamudUtil.FindPlayerByNameHash(ident);
+                if (!string.IsNullOrEmpty(cached.Name) && TryGetWorldPositionByName(cached.Name, out position))
+                {
+                    _logger.LogTrace("TypingIndicator: resolved by cached name {name}", cached.Name);
+                    return true;
+                }
+
+                if (cached.Address != IntPtr.Zero)
+                {
+                    var objRef = _objectTable.CreateObjectReference(cached.Address);
+                    if (objRef != null)
+                    {
+                        position = objRef.Position;
+                        _logger.LogTrace("TypingIndicator: resolved by cached address {addr}", cached.Address);
+                        return true;
+                    }
+                }
+            }
+        }
+
+        var alias = userData.AliasOrUID;
+        if (!string.IsNullOrEmpty(alias) && TryGetWorldPositionByName(alias, out position))
+        {
+            _logger.LogTrace("TypingIndicator: resolved by user alias {alias}", alias);
+            return true;
+        }
+
+        return false;
+    }
+
+    private bool TryGetWorldPositionByName(string name, out Vector3 position)
+    {
+        position = Vector3.Zero;
+        foreach (var obj in _objectTable)
+        {
+            if (obj != null && obj.Name.TextValue.Equals(name, StringComparison.OrdinalIgnoreCase))
+            {
+                position = obj.Position;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private int GetPartyIndexForObjectId(uint objectId)
+    {
+        for (var i = 0; i < _partyList.Count; ++i)
+        {
+            var member = _partyList[i];
+            if (member == null) continue;
+
+            var gameObject = member.GameObject;
+            if (gameObject != null && GetEntityId(gameObject.Address) == objectId)
+                return i;
+        }
+
+        return -1;
+    }
+
+    private int GetPartyIndexForName(string name)
+    {
+        for (var i = 0; i < _partyList.Count; ++i)
+        {
+            var member = _partyList[i];
+            if (member?.Name == null) continue;
+
+            if (member.Name.TextValue.Equals(name, StringComparison.OrdinalIgnoreCase))
+                return i;
+        }
+
+        return -1;
+    }
+
+    private bool IsPartyMember(uint objectId, string? playerName)
+    {
+        if (objectId != 0 && objectId != uint.MaxValue && GetPartyIndexForObjectId(objectId) >= 0)
+            return true;
+
+        if (!string.IsNullOrEmpty(playerName) && GetPartyIndexForName(playerName) >= 0)
+            return true;
+
+        return false;
+    }
+
+    private bool IsPlayerRelevant(Pair? pair, bool isPartyMember)
+    {
+        if (isPartyMember)
+            return true;
+
+        if (pair?.UserPair != null)
+        {
+            var userPair = pair.UserPair;
+            if (userPair.OtherPermissions.IsPaired() || userPair.OwnPermissions.IsPaired())
+                return true;
+        }
+
+        if (pair?.GroupPair != null && pair.GroupPair.Any(g =>
+                !g.Value.GroupUserPermissions.IsPaused() &&
+                !g.Key.GroupUserPermissions.IsPaused()))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    private bool IsWithinRelevantDistance(Vector3 position)
+    {
+        if (_clientState.LocalPlayer == null)
+            return false;
+
+        var distance = Vector3.Distance(_clientState.LocalPlayer.Position, position);
+        return distance <= 40f;
+    }
+
+    private static unsafe uint GetEntityId(nint address)
+    {
+        if (address == nint.Zero) return 0;
+        return ((FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)address)->EntityId;
+    }
+}

MareSynchronos/UI/UISharedService.cs

@@ -36,7 +36,9 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
                                                ImGuiWindowFlags.NoScrollbar |
                                            ImGuiWindowFlags.NoScrollWithMouse;
 
-    public static Vector4 AccentColor { get; set; } = ImGuiColors.DalamudYellow;
+    public static Vector4 AccentColor { get; set; } = ImGuiColors.DalamudViolet;
+    public static Vector4 AccentHoverColor { get; set; } = new Vector4(0x3A / 255f, 0x15 / 255f, 0x50 / 255f, 1f);
+    public static Vector4 AccentActiveColor { get; set; } = AccentHoverColor;
 
     public readonly FileDialogManager FileDialogManager;
 
@@ -136,6 +138,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
     public string PlayerName => _dalamudUtil.GetPlayerName();
 
     public IFontHandle UidFont { get; init; }
+    public MareConfigService ConfigService => _configService;
     public Dictionary<ushort, string> WorldData => _dalamudUtil.WorldData.Value;
 
     public uint WorldId => _dalamudUtil.GetHomeWorldId();
@@ -310,7 +313,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         }
     }
 
-    public static Vector4 GetBoolColor(bool input) => input ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed;
+    public static Vector4 GetBoolColor(bool input) => input ? AccentColor : UiSharedService.AccentColor;
 
     public float GetIconTextButtonSize(FontAwesomeIcon icon, string text)
     {
@@ -368,6 +371,8 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         Vector2 cursorScreenPos = ImGui.GetCursorScreenPos();
         float x = vector.X + ImGui.GetStyle().FramePadding.X * 2f;
         float frameHeight = height ?? ImGui.GetFrameHeight();
+        using var hoverColor = ImRaii.PushColor(ImGuiCol.ButtonHovered, AccentHoverColor);
+        using var activeColor = ImRaii.PushColor(ImGuiCol.ButtonActive, AccentActiveColor);
         bool result = ImGui.Button(string.Empty, new Vector2(x, frameHeight));
         Vector2 pos = new Vector2(cursorScreenPos.X + ImGui.GetStyle().FramePadding.X,
             cursorScreenPos.Y + (height ?? ImGui.GetFrameHeight()) / 2f - (vector.Y / 2f));
@@ -378,13 +383,19 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         return result;
     }
 
-    private bool IconTextButtonInternal(FontAwesomeIcon icon, string text, Vector4? defaultColor = null, float? width = null)
+    private bool IconTextButtonInternal(FontAwesomeIcon icon, string text, Vector4? defaultColor = null, float? width = null, bool useAccentHover = true)
     {
-        int num = 0;
+        int colorsPushed = 0;
         if (defaultColor.HasValue)
         {
             ImGui.PushStyleColor(ImGuiCol.Button, defaultColor.Value);
-            num++;
+            colorsPushed++;
+        }
+        if (useAccentHover)
+        {
+            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, AccentHoverColor);
+            ImGui.PushStyleColor(ImGuiCol.ButtonActive, AccentActiveColor);
+            colorsPushed += 2;
         }
 
         ImGui.PushID(text);
@@ -404,9 +415,9 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
         Vector2 pos2 = new Vector2(pos.X + vector.X + num2, cursorScreenPos.Y + ImGui.GetStyle().FramePadding.Y);
         windowDrawList.AddText(pos2, ImGui.GetColorU32(ImGuiCol.Text), text);
         ImGui.PopID();
-        if (num > 0)
+        if (colorsPushed > 0)
         {
-            ImGui.PopStyleColor(num);
+            ImGui.PopStyleColor(colorsPushed);
         }
 
         return result;
@@ -416,7 +427,8 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
     {
         return IconTextButtonInternal(icon, text,
             isInPopup ? ColorHelpers.RgbaUintToVector4(ImGui.GetColorU32(ImGuiCol.PopupBg)) : null,
-            width <= 0 ? null : width);
+            width <= 0 ? null : width,
+            !isInPopup);
     }
 
     public static bool IsDirectoryWritable(string dirPath, bool throwIfFails = false)
@@ -517,8 +529,8 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
 
     public void BooleanToColoredIcon(bool value, bool inline = true)
     {
-        using var colorgreen = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.HealerGreen, value);
-        using var colorred = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed, !value);
+        using var colorgreen = ImRaii.PushColor(ImGuiCol.Text, AccentColor, value);
+        using var colorred = ImRaii.PushColor(ImGuiCol.Text, UiSharedService.AccentColor, !value);
 
         if (inline) ImGui.SameLine();
 
@@ -592,24 +604,24 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
 
         if (_isPenumbraDirectory)
         {
-            ColorTextWrapped("Do not point the storage path directly to the Penumbra directory. If necessary, make a subfolder in it.", ImGuiColors.DalamudRed);
+            ColorTextWrapped("Do not point the storage path directly to the Penumbra directory. If necessary, make a subfolder in it.", UiSharedService.AccentColor);
         }
         else if (_isOneDrive)
         {
-            ColorTextWrapped("Do not point the storage path to a folder in OneDrive. Do not use OneDrive folders for any Mod related functionality.", ImGuiColors.DalamudRed);
+            ColorTextWrapped("Do not point the storage path to a folder in OneDrive. Do not use OneDrive folders for any Mod related functionality.", UiSharedService.AccentColor);
         }
         else if (!_isDirectoryWritable)
         {
-            ColorTextWrapped("The folder you selected does not exist or cannot be written to. Please provide a valid path.", ImGuiColors.DalamudRed);
+            ColorTextWrapped("The folder you selected does not exist or cannot be written to. Please provide a valid path.", UiSharedService.AccentColor);
         }
         else if (_cacheDirectoryHasOtherFilesThanCache)
         {
-            ColorTextWrapped("Your selected directory has files or directories inside that are not Umbra related. Use an empty directory or a previous storage directory only.", ImGuiColors.DalamudRed);
+            ColorTextWrapped("Your selected directory has files or directories inside that are not Umbra related. Use an empty directory or a previous storage directory only.", UiSharedService.AccentColor);
         }
         else if (!_cacheDirectoryIsValidPath)
         {
             ColorTextWrapped("Your selected directory contains illegal characters unreadable by FFXIV. " +
-                             "Restrict yourself to latin letters (A-Z), underscores (_), dashes (-) and arabic numbers (0-9).", ImGuiColors.DalamudRed);
+                             "Restrict yourself to latin letters (A-Z), underscores (_), dashes (-) and arabic numbers (0-9).", UiSharedService.AccentColor);
         }
 
         float maxCacheSize = (float)_configService.Current.MaxLocalCacheInGiB;
@@ -848,7 +860,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
 
         if (!_penumbraExists || !_glamourerExists)
         {
-            ImGui.TextColored(ImGuiColors.DalamudRed, "You need to install both Penumbra and Glamourer and keep them up to date to use Umbra.");
+            ImGui.TextColored(UiSharedService.AccentColor, "You need to install both Penumbra and Glamourer and keep them up to date to use Umbra.");
             return false;
         }
 

MareSynchronos/UmbraSync.json

@@ -1,14 +1,14 @@
 {
-  "Author": "SirConstance",
+  "Author": "Keda",
   "Name": "UmbraSync",
-  "Punchline": "Share your true self.",
-  "Description": "This plugin will synchronize your Penumbra mods and current Glamourer state with other paired clients automatically.",
+  "Punchline": "Parce que nous le valons bien.",
+  "Description": "Ce plugin synchronisera automatiquement vos mods Penumbra et l'état actuel de Glamourer avec les autres clients appairés.",
   "InternalName": "UmbraSync",
   "ApplicableVersion": "any",
   "Tags": [
     "customization"
   ],
-  "IconUrl": "",
-  "RepoUrl": "",
+  "IconUrl": "https://repo.umbra-sync.net/images/logo.png",
+  "RepoUrl": "https://repo.umbra-sync.net/plugin.json",
   "CanUnloadAsync": true
 }

MareSynchronos/WebAPI/AutoDetect/DiscoveryApiClient.cs

@@ -0,0 +1,224 @@
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.Extensions.Logging;
+using MareSynchronos.WebAPI.SignalR;
+using MareSynchronos.Services.AutoDetect;
+
+namespace MareSynchronos.WebAPI.AutoDetect;
+
+public class DiscoveryApiClient
+{
+    private readonly ILogger<DiscoveryApiClient> _logger;
+    private readonly TokenProvider _tokenProvider;
+    private readonly DiscoveryConfigProvider _configProvider;
+    private readonly HttpClient _httpClient = new();
+    private static readonly JsonSerializerOptions JsonOpt = new() { PropertyNameCaseInsensitive = true };
+
+    public DiscoveryApiClient(ILogger<DiscoveryApiClient> logger, TokenProvider tokenProvider, DiscoveryConfigProvider configProvider)
+    {
+        _logger = logger;
+        _tokenProvider = tokenProvider;
+        _configProvider = configProvider;
+        _httpClient.Timeout = TimeSpan.FromSeconds(30);
+    }
+
+    public async Task<List<ServerMatch>> QueryAsync(string endpoint, IEnumerable<string> hashes, CancellationToken ct)
+    {
+        try
+        {
+            var token = await _tokenProvider.GetOrUpdateToken(ct).ConfigureAwait(false);
+            if (string.IsNullOrEmpty(token)) return [];
+            var distinctHashes = hashes.Distinct(StringComparer.Ordinal).ToArray();
+            using var req = new HttpRequestMessage(HttpMethod.Post, endpoint);
+            req.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
+            var body = JsonSerializer.Serialize(new
+            {
+                hashes = distinctHashes,
+                salt = _configProvider.SaltB64
+            });
+            req.Content = new StringContent(body, Encoding.UTF8, "application/json");
+            var resp = await _httpClient.SendAsync(req, ct).ConfigureAwait(false);
+            if (resp.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+            {
+                var token2 = await _tokenProvider.ForceRefreshToken(ct).ConfigureAwait(false);
+                if (string.IsNullOrEmpty(token2)) return [];
+                using var req2 = new HttpRequestMessage(HttpMethod.Post, endpoint);
+                req2.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token2);
+                var body2 = JsonSerializer.Serialize(new
+                {
+                    hashes = distinctHashes,
+                    salt = _configProvider.SaltB64
+                });
+                req2.Content = new StringContent(body2, Encoding.UTF8, "application/json");
+                resp = await _httpClient.SendAsync(req2, ct).ConfigureAwait(false);
+            }
+            resp.EnsureSuccessStatusCode();
+            var json = await resp.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
+            var result = JsonSerializer.Deserialize<List<ServerMatch>>(json, JsonOpt) ?? [];
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Discovery query failed");
+            return [];
+        }
+    }
+
+    public async Task<bool> SendRequestAsync(string endpoint, string? token, string? targetUid, string? displayName, CancellationToken ct)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(token) && string.IsNullOrEmpty(targetUid))
+            {
+                _logger.LogWarning("Discovery request aborted: no token or targetUid provided");
+                return false;
+            }
+
+            var jwt = await _tokenProvider.GetOrUpdateToken(ct).ConfigureAwait(false);
+            if (string.IsNullOrEmpty(jwt)) return false;
+            using var req = new HttpRequestMessage(HttpMethod.Post, endpoint);
+            req.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+            var body = JsonSerializer.Serialize(new RequestPayload(token, targetUid, displayName));
+            req.Content = new StringContent(body, Encoding.UTF8, "application/json");
+            var resp = await _httpClient.SendAsync(req, ct).ConfigureAwait(false);
+            if (resp.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+            {
+                var jwt2 = await _tokenProvider.ForceRefreshToken(ct).ConfigureAwait(false);
+                if (string.IsNullOrEmpty(jwt2)) return false;
+                using var req2 = new HttpRequestMessage(HttpMethod.Post, endpoint);
+                req2.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt2);
+                var body2 = JsonSerializer.Serialize(new RequestPayload(token, targetUid, displayName));
+                req2.Content = new StringContent(body2, Encoding.UTF8, "application/json");
+                resp = await _httpClient.SendAsync(req2, ct).ConfigureAwait(false);
+            }
+            if (!resp.IsSuccessStatusCode)
+            {
+                string txt = string.Empty;
+                try { txt = await resp.Content.ReadAsStringAsync(ct).ConfigureAwait(false); } catch { }
+                _logger.LogWarning("Discovery request failed: {code} {reason} {body}", (int)resp.StatusCode, resp.ReasonPhrase, txt);
+                return false;
+            }
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Discovery send request failed");
+            return false;
+        }
+    }
+
+    private sealed record RequestPayload(
+        [property: JsonPropertyName("token"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        string? Token,
+        [property: JsonPropertyName("targetUid"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        string? TargetUid,
+        [property: JsonPropertyName("displayName"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        string? DisplayName);
+
+    public async Task<bool> PublishAsync(string endpoint, IEnumerable<string> hashes, string? displayName, CancellationToken ct, bool allowRequests = true)
+    {
+        try
+        {
+            var jwt = await _tokenProvider.GetOrUpdateToken(ct).ConfigureAwait(false);
+            if (string.IsNullOrEmpty(jwt)) return false;
+            using var req = new HttpRequestMessage(HttpMethod.Post, endpoint);
+            req.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+            var bodyObj = new
+            {
+                hashes = hashes.Distinct(StringComparer.Ordinal).ToArray(),
+                displayName,
+                salt = _configProvider.SaltB64,
+                allowRequests
+            };
+            var body = JsonSerializer.Serialize(bodyObj);
+            req.Content = new StringContent(body, Encoding.UTF8, "application/json");
+            var resp = await _httpClient.SendAsync(req, ct).ConfigureAwait(false);
+            if (resp.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+            {
+                var jwt2 = await _tokenProvider.ForceRefreshToken(ct).ConfigureAwait(false);
+                if (string.IsNullOrEmpty(jwt2)) return false;
+                using var req2 = new HttpRequestMessage(HttpMethod.Post, endpoint);
+                req2.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt2);
+                var body2 = JsonSerializer.Serialize(bodyObj);
+                req2.Content = new StringContent(body2, Encoding.UTF8, "application/json");
+                resp = await _httpClient.SendAsync(req2, ct).ConfigureAwait(false);
+            }
+            return resp.IsSuccessStatusCode;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Discovery publish failed");
+            return false;
+        }
+    }
+
+    public async Task<bool> SendAcceptAsync(string endpoint, string targetUid, string? displayName, CancellationToken ct)
+    {
+        try
+        {
+            var jwt = await _tokenProvider.GetOrUpdateToken(ct).ConfigureAwait(false);
+            if (string.IsNullOrEmpty(jwt)) return false;
+            using var req = new HttpRequestMessage(HttpMethod.Post, endpoint);
+            req.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+            var bodyObj = new { targetUid, displayName };
+            var body = JsonSerializer.Serialize(bodyObj);
+            req.Content = new StringContent(body, Encoding.UTF8, "application/json");
+            var resp = await _httpClient.SendAsync(req, ct).ConfigureAwait(false);
+            if (resp.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+            {
+                var jwt2 = await _tokenProvider.ForceRefreshToken(ct).ConfigureAwait(false);
+                if (string.IsNullOrEmpty(jwt2)) return false;
+                using var req2 = new HttpRequestMessage(HttpMethod.Post, endpoint);
+                req2.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt2);
+                var body2 = JsonSerializer.Serialize(bodyObj);
+                req2.Content = new StringContent(body2, Encoding.UTF8, "application/json");
+                resp = await _httpClient.SendAsync(req2, ct).ConfigureAwait(false);
+            }
+            return resp.IsSuccessStatusCode;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Discovery accept notify failed");
+            return false;
+        }
+    }
+    public async Task DisableAsync(string endpoint, CancellationToken ct)
+    {
+        try
+        {
+            var jwt = await _tokenProvider.GetOrUpdateToken(ct).ConfigureAwait(false);
+            if (string.IsNullOrEmpty(jwt)) return;
+            using var req = new HttpRequestMessage(HttpMethod.Post, endpoint);
+            req.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt);
+            var resp = await _httpClient.SendAsync(req, ct).ConfigureAwait(false);
+            if (resp.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+            {
+                var jwt2 = await _tokenProvider.ForceRefreshToken(ct).ConfigureAwait(false);
+                if (string.IsNullOrEmpty(jwt2)) return;
+                using var req2 = new HttpRequestMessage(HttpMethod.Post, endpoint);
+                req2.Headers.Authorization = new AuthenticationHeaderValue("Bearer", jwt2);
+                resp = await _httpClient.SendAsync(req2, ct).ConfigureAwait(false);
+            }
+            if (!resp.IsSuccessStatusCode)
+            {
+                string txt = string.Empty;
+                try { txt = await resp.Content.ReadAsStringAsync(ct).ConfigureAwait(false); } catch { }
+                _logger.LogWarning("Discovery disable failed: {code} {reason} {body}", (int)resp.StatusCode, resp.ReasonPhrase, txt);
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Discovery disable failed");
+        }
+    }
+}
+
+public sealed class ServerMatch
+{
+    public string Hash { get; set; } = string.Empty;
+    public string? Token { get; set; }
+    public string? Uid { get; set; }
+    public string? DisplayName { get; set; }
+}