Merge branch 'master' into 2.0.0
This commit is contained in:
@@ -109,7 +109,8 @@ internal class ContextMenuService : IHostedService
|
|||||||
if (targetData == null || targetData.Address == nint.Zero)
|
if (targetData == null || targetData.Address == nint.Zero)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!_configService.Current.EnableRightClickMenus)
|
//Check if user is directly paired or is own.
|
||||||
|
if (VisibleUserIds.Any(u => u == target.TargetObjectId) || _clientState.LocalPlayer.GameObjectId == target.TargetObjectId || !_configService.Current.EnableRightClickMenus)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var snapshot = _pairUiService.GetSnapshot();
|
var snapshot = _pairUiService.GetSnapshot();
|
||||||
@@ -237,6 +238,10 @@ internal class ContextMenuService : IHostedService
|
|||||||
_mediator.Publish(new NotificationMessage(title, message, type, TimeSpan.FromSeconds(durationSeconds)));
|
_mediator.Publish(new NotificationMessage(title, message, type, TimeSpan.FromSeconds(durationSeconds)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private HashSet<ulong> VisibleUserIds => [.. _pairManager.DirectPairs
|
||||||
|
.Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue)
|
||||||
|
.Select(u => (ulong)u.PlayerCharacterId)];
|
||||||
|
|
||||||
private bool CanOpenLightfinderProfile(string hashedCid)
|
private bool CanOpenLightfinderProfile(string hashedCid)
|
||||||
{
|
{
|
||||||
if (!_broadcastService.IsBroadcasting)
|
if (!_broadcastService.IsBroadcasting)
|
||||||
|
|||||||
@@ -741,5 +741,44 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
|
|||||||
ServerState = state;
|
ServerState = state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Task<UserProfileDto?> UserGetLightfinderProfile(string hashedCid)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task UpdateChatPresence(ChatPresenceUpdateDto presence)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task Client_ChatReceive(ChatMessageDto message)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels()
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<IReadOnlyList<GroupChatChannelInfoDto>> GetGroupChatChannels()
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task SendChatMessage(ChatSendRequestDto request)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task ReportChatMessage(ChatReportSubmitDto request)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<ChatParticipantResolveResultDto?> ResolveChatParticipant(ChatParticipantResolveRequestDto request)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#pragma warning restore MA0040
|
#pragma warning restore MA0040
|
||||||
|
|||||||
1
PenumbraAPI
Submodule
1
PenumbraAPI
Submodule
Submodule PenumbraAPI added at a2f8923546
Reference in New Issue
Block a user