[PR] Merge pull request #121 from SheepGoMeh/fix/friend-list

- Fixed an edge case with friend list, where players marked as friends didn't register as such when your relogged, or got out of a duty

Author: SheepGoMeh

Visibility/Service.cs

@@ -24,5 +24,7 @@ public class Service
 
 	[PluginService] public static ICondition Condition { get; set; } = null!;
 
+	[PluginService] public static IGameInteropProvider GameInteropProvider { get; set; } = null!;
+
 	[PluginService] public static IPluginLog PluginLog { get; set; } = null!;
 }

Visibility/Utils/FrameworkHandler.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Objects.Types;
+using Dalamud.Hooking;
 
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Game.Control;
@@ -57,10 +57,14 @@ public class FrameworkHandler: IDisposable
 	private Func<bool>? isDisabled;
 	private bool isChangingTerritory;
 
+	// Friend list sync via EndRequest hook
+	private unsafe delegate void EndRequestDelegate(InfoProxyInterface* thisPtr);
+	private Hook<EndRequestDelegate>? endRequestHook;
+
 	/// <summary>
 	/// Constructor for FrameworkHandler
 	/// </summary>
-	public FrameworkHandler(VisibilityConfiguration configuration)
+	public unsafe FrameworkHandler(VisibilityConfiguration configuration)
 	{
 		// Initialize managers
 		this.containerManager = new ContainerManager();
@@ -72,6 +76,15 @@ public FrameworkHandler(VisibilityConfiguration configuration)
 		this.petHandler = new PetHandler(this.containerManager, this.voidListManager, this.visibilityManager, configuration);
 		this.chocoboHandler = new ChocoboHandler(this.containerManager, this.voidListManager, this.visibilityManager, configuration);
 		this.minionHandler = new MinionHandler(this.containerManager, this.visibilityManager, configuration);
+
+		// Hook InfoProxyFriendList.EndRequest to sync friend content IDs when the list is refreshed
+		InfoProxyFriendList* friendList = InfoProxyFriendList.Instance();
+		if (friendList != null)
+		{
+			nint endRequestAddr = (nint)((InfoProxyInterface*)friendList)->VirtualTable->EndRequest;
+			this.endRequestHook = Service.GameInteropProvider.HookFromAddress<EndRequestDelegate>(endRequestAddr, this.OnFriendListEndRequest);
+			this.endRequestHook.Enable();
+		}
 	}
 
 	public void SetDisableCheck(Func<bool> check) => this.isDisabled = check;
@@ -200,6 +213,16 @@ public void Show(UnitType unitType, ContainerType containerType)
 		this.containerManager.ClearContainer(unitType, containerType);
 	}
 
+	/// <summary>
+	/// Hook callback for InfoProxyFriendList.EndRequest.
+	/// Forces a friend container refresh so IsFriend is re-evaluated on the next frame.
+	/// </summary>
+	private unsafe void OnFriendListEndRequest(InfoProxyInterface* thisPtr)
+	{
+		this.endRequestHook!.Original(thisPtr);
+		this.ShowAll();
+	}
+
 	/// <summary>
 	/// Handle territory change events
 	/// </summary>
@@ -329,5 +352,10 @@ public void ShowPlayer(string name)
 	/// <summary>
 	/// Dispose the framework handler and show all hidden entities
 	/// </summary>
-	public void Dispose() => this.ShowAll();
+	public void Dispose()
+	{
+		this.endRequestHook?.Disable();
+		this.endRequestHook?.Dispose();
+		this.ShowAll();
+	}
 }

Visibility/Visibility.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Dalamud.NET.Sdk/14.0.1">
 	<PropertyGroup>
-		<AssemblyVersion>1.1.9.3</AssemblyVersion>
+		<AssemblyVersion>1.1.9.4</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<IsPackable>false</IsPackable>
 		<Authors>SheepGoMeh</Authors>