ToggleLocationSharing return bool

Reviewed-on: #18

LightlessSyncAPI/Data/Enum/GroupPermissions.cs

@@ -8,4 +8,5 @@ public enum GroupPermissions
     PreferDisableSounds = 0x2,
     DisableInvites = 0x4,
     PreferDisableVFX = 0x8,
+    DisableChat = 0x10,
 }

LightlessSyncAPI/Data/Extensions/GroupPermissionsExtensions.cs

@@ -24,6 +24,11 @@ public static class GroupPermissionsExtensions
         return perm.HasFlag(GroupPermissions.PreferDisableVFX);
     }
 
+    public static bool IsDisableChat(this GroupPermissions perm)
+    {
+        return perm.HasFlag(GroupPermissions.DisableChat);
+    }
+
     public static void SetDisableInvites(this ref GroupPermissions perm, bool set)
     {
         if (set) perm |= GroupPermissions.DisableInvites;
@@ -47,4 +52,10 @@ public static class GroupPermissionsExtensions
         if (set) perm |= GroupPermissions.PreferDisableVFX;
         else perm &= ~GroupPermissions.PreferDisableVFX;
     }
+
+    public static void SetDisableChat(this ref GroupPermissions perm, bool set)
+    {
+        if (set) perm |= GroupPermissions.DisableChat;
+        else perm &= ~GroupPermissions.DisableChat;
+    }
 }

LightlessSyncAPI/Dto/CharaData/CharaDataFullDto.cs

@@ -59,6 +59,7 @@ public record struct LocationInfo
     [Key(4)] public uint WardId { get; set; }
     [Key(5)] public uint HouseId { get; set; }
     [Key(6)] public uint RoomId { get; set; }
+    [Key(7)] public uint InstanceId { get; set; }
 }
 
 [MessagePackObject]

LightlessSyncAPI/Dto/Chat/ChatDtos.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using LightlessSync.API.Data;
+using LightlessSync.API.Dto.User;
+using MessagePack;
+
+namespace LightlessSync.API.Dto.Chat;
+
+public enum ChatChannelType : byte
+{
+    Zone = 0,
+    Group = 1
+}
+
+public enum ChatSenderKind : byte
+{
+    Anonymous = 0,
+    IdentifiedUser = 1
+}
+
+[MessagePackObject]
+public readonly record struct ChatChannelDescriptor
+{
+    [Key(0)] public ChatChannelType Type { get; init; }
+    [Key(1)] public ushort WorldId { get; init; }
+    [Key(2)] public ushort ZoneId { get; init; }
+    [Key(3)] public string? CustomKey { get; init; }
+
+    public ChatChannelDescriptor WithNormalizedCustomKey() =>
+        this with { CustomKey = string.IsNullOrWhiteSpace(CustomKey) ? string.Empty : CustomKey };
+}
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct ChatPresenceUpdateDto(ChatChannelDescriptor Channel, ushort TerritoryId, bool IsActive);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct ChatSendRequestDto(ChatChannelDescriptor Channel, string Message);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct ChatSenderDescriptor(
+    ChatSenderKind Kind,
+    string Token,
+    string? DisplayName,
+    string? HashedCid,
+    UserData? User,
+    bool CanResolveProfile);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct ChatMessageDto(
+    ChatChannelDescriptor Channel,
+    ChatSenderDescriptor Sender,
+    string Message,
+    DateTime SentAtUtc,
+    string MessageId);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct ChatReportSubmitDto(
+    ChatChannelDescriptor Channel,
+    string MessageId,
+    string Reason,
+    string? AdditionalContext);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct ChatParticipantMuteRequestDto(
+    ChatChannelDescriptor Channel,
+    string Token,
+    bool Mute);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct ZoneChatChannelInfoDto(
+    ChatChannelDescriptor Channel,
+    string DisplayName,
+    IReadOnlyList<string> Territories);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct GroupChatChannelInfoDto(
+    ChatChannelDescriptor Channel,
+    string DisplayName,
+    string GroupId,
+    bool IsOwner);

LightlessSyncAPI/Dto/Files/DownloadFileDto.cs

@@ -8,6 +8,7 @@ public record DownloadFileDto : ITransferFileDto
     public bool FileExists { get; set; } = true;
     public string Hash { get; set; } = string.Empty;
     public string Url { get; set; } = string.Empty;
+    public string CDNDownloadUrl { get; set; } = string.Empty;
     public long Size { get; set; } = 0;
     public bool IsForbidden { get; set; } = false;
     public string ForbiddenBy { get; set; } = string.Empty;

LightlessSyncAPI/Dto/Group/GroupFullInfoDto.cs

@@ -7,8 +7,9 @@ namespace LightlessSync.API.Dto.Group;
 [MessagePackObject(keyAsPropertyName: true)]
 public record GroupFullInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions,
     GroupUserPreferredPermissions GroupUserPermissions, GroupPairUserInfo GroupUserInfo,
-    Dictionary<string, GroupPairUserInfo> GroupPairUserInfos) : GroupInfoDto(Group, Owner, GroupPermissions)
+    Dictionary<string, GroupPairUserInfo> GroupPairUserInfos, int GroupUserCount) : GroupInfoDto(Group, Owner, GroupPermissions)
 {
     public GroupUserPreferredPermissions GroupUserPermissions { get; set; } = GroupUserPermissions;
     public GroupPairUserInfo GroupUserInfo { get; set; } = GroupUserInfo;
+    public int GroupUserCount { get; set; } = GroupUserCount;
 }

LightlessSyncAPI/Dto/Group/GroupProfileAvailabilityRequest.cs

@@ -0,0 +1,6 @@
+using MessagePack;
+
+namespace LightlessSync.API.Dto.Group;
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record GroupProfileAvailabilityRequest(string GID);

LightlessSyncAPI/Dto/Group/GroupProfileDto.cs

@@ -2,5 +2,5 @@
 
 namespace LightlessSync.API.Dto.Group
 {
-    public record GroupProfileDto(GroupData Group, string? Description, string? Tags, string? PictureBase64) : GroupDto(Group);
+    public record GroupProfileDto(GroupData Group, string? Description, int[]? Tags, string? PictureBase64, string? BannerBase64, bool? IsNsfw, bool? IsDisabled) : GroupDto(Group);
 }

LightlessSyncAPI/Dto/Group/GroupPruneSettingsDto.cs

@@ -0,0 +1,7 @@
+using LightlessSync.API.Data;
+using MessagePack;
+
+namespace LightlessSync.API.Dto.Group;
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record GroupPruneSettingsDto(GroupData Group, bool AutoPruneEnabled, int AutoPruneDays);

LightlessSyncAPI/Dto/User/LocationSharingDto.cs

@@ -0,0 +1,15 @@
+using LightlessSync.API.Data;
+using LightlessSync.API.Dto.CharaData;
+using MessagePack;
+
+namespace LightlessSync.API.Dto.User;
+
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record LocationDto(UserData User, LocationInfo Location);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record LocationWithTimeDto(LocationDto LocationDto, DateTimeOffset ExpireAt);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record SharingStatusDto(UserData User, DateTimeOffset ExpireAt);

LightlessSyncAPI/Dto/User/LocationSharingToggleDto.cs

@@ -0,0 +1,6 @@
+using MessagePack;
+
+namespace LightlessSync.API.Dto.User;
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record LocationSharingToggleDto(List<string> users, DateTimeOffset duration);

LightlessSyncAPI/Dto/User/UserProfileAvailabilityRequest.cs

@@ -0,0 +1,5 @@
+using MessagePack;
+
+namespace LightlessSync.API.Dto.User;
+[MessagePackObject(keyAsPropertyName: true)]
+public record UserProfileAvailabilityRequest(string UID);

LightlessSyncAPI/Dto/User/UserProfileDto.cs

@@ -4,4 +4,4 @@ using MessagePack;
 namespace LightlessSync.API.Dto.User;
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record UserProfileDto(UserData User, bool Disabled, bool? IsNSFW, string? ProfilePictureBase64, string? Description) : UserDto(User);
+public record UserProfileDto(UserData User, bool Disabled, bool? IsNSFW, string? ProfilePictureBase64, string? BannerPictureBase64, string? Description, int[]? Tags) : UserDto(User);

LightlessSyncAPI/LightlessSync.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

LightlessSyncAPI/Routes/LightlessAuth.cs

@@ -13,9 +13,12 @@ public class LightlessAuth
     public const string OAuth_GetUIDs = "getUIDs";
     public const string OAuth_GetDiscordOAuthToken = "getDiscordOAuthToken";
     public const string User = "/user";
+    public const string Group = "/group";
     public const string User_Unban_Discord = "unbanDiscord";
     public const string User_Unban_Uid = "unbanUID";
     public const string Ban_Uid = "ban";
+    public const string Disable_Profile = "disableProfile";
+    public const string Enable_Profile = "enableProfile";
     public static Uri AuthFullPath(Uri baseUri) => new Uri(baseUri, Auth + "/" + Auth_CreateIdent);
     public static Uri AuthWithOauthFullPath(Uri baseUri) => new Uri(baseUri, OAuth + "/" + OAuth_CreateOAuth);
     public static Uri RenewTokenFullPath(Uri baseUri) => new Uri(baseUri, Auth + "/" + Auth_RenewToken);

LightlessSyncAPI/Routes/LightlessFiles.cs

@@ -18,6 +18,7 @@ public class LightlessFiles
     public const string ServerFiles_Upload = "upload";
     public const string ServerFiles_UploadMunged = "uploadMunged";
     public const string ServerFiles_DownloadServers = "downloadServers";
+    public const string ServerFiles_DirectDownload = "direct";
 
     public const string Distribution = "/dist";
     public const string Distribution_Get = "get";
@@ -41,6 +42,7 @@ public class LightlessFiles
     public static Uri ServerFilesUploadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_Upload + "/" + hash);
     public static Uri ServerFilesUploadMunged(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_UploadMunged + "/" + hash);
     public static Uri ServerFilesGetDownloadServersFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_DownloadServers);
+    public static Uri ServerFilesDirectDownloadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_DirectDownload + "/" + hash);
     public static Uri DistributionGetFullPath(Uri baseUri, string hash) => new(baseUri, Distribution + "/" + Distribution_Get + "?file=" + hash);
     public static Uri SpeedtestRunFullPath(Uri baseUri) => new(baseUri, Speedtest + "/" + Speedtest_Run);
     public static Uri MainSendReadyFullPath(Uri baseUri, string uid, Guid request) => new(baseUri, Main + "/" + Main_SendReady + "/" + "?uid=" + uid + "&requestId=" + request.ToString());

LightlessSyncAPI/SignalR/ILightlessHub.cs

@@ -1,6 +1,7 @@
 using LightlessSync.API.Data;
 using LightlessSync.API.Data.Enum;
 using LightlessSync.API.Dto;
+using LightlessSync.API.Dto.Chat;
 using LightlessSync.API.Dto.CharaData;
 using LightlessSync.API.Dto.Group;
 using LightlessSync.API.Dto.User;
@@ -9,7 +10,7 @@ namespace LightlessSync.API.SignalR;
 
 public interface ILightlessHub
 {
-    const int ApiVersion = 33;
+    const int ApiVersion = 35;
     const string Path = "/lightless";
 
     Task<bool> CheckClientHealth();
@@ -43,8 +44,12 @@ public interface ILightlessHub
     Task Client_GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
     Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData);
     Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData);
+    Task Client_ChatReceive(ChatMessageDto message);
+    Task Client_SendLocationToClient(LocationDto locationDto, DateTimeOffset expireAt);
 
     Task<ConnectionDto> GetConnectionDto();
+    Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
+    Task<IReadOnlyList<GroupChatChannelInfoDto>> GetGroupChatChannels();
 
     Task GroupBanUser(GroupPairDto dto, string reason);
     Task GroupChangeGroupPermissionState(GroupPermissionDto dto);
@@ -64,24 +69,27 @@ public interface ILightlessHub
     Task<GroupProfileDto> GroupGetProfile(GroupDto dto);
     Task GroupSetProfile(GroupProfileDto dto);
     Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
+    Task<GroupPruneSettingsDto> GroupGetPruneSettings(GroupDto dto);
+    Task GroupSetPruneSettings(GroupPruneSettingsDto dto);
     Task<List<GroupFullInfoDto>> GroupsGetAll();
     Task GroupUnbanUser(GroupPairDto groupPair);
     Task<int> GroupPrune(GroupDto group, int days, bool execute);
 
     Task UserAddPair(UserDto user);
-    Task TryPairWithContentId(string otherCid, string myCid);
+    Task TryPairWithContentId(string otherCid);
 
-    Task SetBroadcastStatus(string hashedCid, bool enabled, GroupBroadcastRequestDto? groupDto = null);
+    Task SetBroadcastStatus(bool enabled, GroupBroadcastRequestDto? groupDto = null);
     Task<bool> SetGroupBroadcastStatus(GroupBroadcastRequestDto dto);
     Task<List<GroupJoinDto>> GetBroadcastedGroups(List<BroadcastStatusInfoDto> broadcastEntries);
     Task<BroadcastStatusInfoDto?> IsUserBroadcasting(string hashedCid);
     Task<BroadcastStatusBatchDto?> AreUsersBroadcasting(List<string> hashedCids);
-    Task<TimeSpan?> GetBroadcastTtl(string hashedCid);
+    Task<TimeSpan?> GetBroadcastTtl();
 
     Task UserDelete();
     Task<List<OnlineUserIdentDto>> UserGetOnlinePairs(CensusDataDto? censusDataDto);
     Task<List<UserFullPairDto>> UserGetPairedClients();
     Task<UserProfileDto> UserGetProfile(UserDto dto);
+    Task<UserProfileDto?> UserGetLightfinderProfile(string hashedCid);
     Task UserPushData(UserCharaDataMessageDto dto);
     Task UserUpdateVanityColors(UserVanityColorsDto dto);
     Task UserRemovePair(UserDto userDto);
@@ -104,4 +112,13 @@ public interface ILightlessHub
     Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
     Task GposeLobbyPushPoseData(PoseData poseData);
     Task GposeLobbyPushWorldData(WorldData worldData);
+    Task UpdateChatPresence(ChatPresenceUpdateDto presence);
+    Task SendChatMessage(ChatSendRequestDto request);
+    Task ReportChatMessage(ChatReportSubmitDto request);
+    Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
+    
+    Task UpdateLocation(LocationDto locationDto, bool offline);
+    Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo();
+    Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto);
+    
 }

LightlessSyncAPI/SignalR/ILightlessHubClient.cs

@@ -58,4 +58,5 @@ public interface ILightlessHubClient : ILightlessHub
     void OnGposeLobbyPushCharacterData(Action<CharaDataDownloadDto> act);
     void OnGposeLobbyPushPoseData(Action<UserData, PoseData> act);
     void OnGposeLobbyPushWorldData(Action<UserData, WorldData> act);
+    void OnReceiveLocation(Action<LocationDto, DateTimeOffset> act);
 }