13 Commits

Author SHA1 Message Date
cake
3c5babe2b6 Updated to .net10 2025-11-14 06:03:24 +01:00
0170ac377d Initial Chat Merge
Reviewed-on: #13
2025-11-11 18:56:38 +01:00
9d9e8e9be6 Merge branch 'main' into chat 2025-11-11 18:56:23 +01:00
3500db98c2 Merge pull request 'Initial Bot Cleanup + Profile Toggling' (#12) from bot-refactoring into main
Reviewed-on: #12
2025-11-11 18:46:49 +01:00
defnotken
cec110d972 Initial Bot Cleanup + Profile Toggling 2025-10-29 17:23:07 -05:00
azyges
bb88bea5aa revert api bump from testing 2025-10-29 07:55:17 +09:00
azyges
67cb24a069 i hate chats 2025-10-29 07:43:49 +09:00
bb92cd477d Merge pull request 'Added banner info' (#11) from banner-profile into main
Reviewed-on: #11
2025-10-21 22:47:27 +02:00
CakeAndBanana
7d51340b0b Added banner info 2025-10-20 20:45:34 +02:00
0bc7abb274 Merge pull request 'tag-changes' (#10) from tag-changes into main
Reviewed-on: #10
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>
2025-10-19 21:20:45 +02:00
CakeAndBanana
9ac91682e6 Added tags for DTO on user profiles 2025-10-19 20:57:31 +02:00
CakeAndBanana
01688b27bc Change tag string to int[] 2025-10-19 18:40:20 +02:00
418e647ef8 Change to Group-Dto-Changes
Reviewed-on: #9
2025-10-16 22:29:53 +02:00
8 changed files with 116 additions and 9 deletions

View File

@@ -0,0 +1,85 @@
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 ChatParticipantResolveRequestDto(
ChatChannelDescriptor Channel,
string Token);
[MessagePackObject(keyAsPropertyName: true)]
public readonly record struct ChatParticipantResolveResultDto(
ChatChannelDescriptor Channel,
ChatSenderDescriptor Sender,
UserProfileDto? Profile);
[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);

View File

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

View File

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

View File

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

View File

@@ -4,4 +4,4 @@ using MessagePack;
namespace LightlessSync.API.Dto.User; namespace LightlessSync.API.Dto.User;
[MessagePackObject(keyAsPropertyName: true)] [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);

View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>

View File

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

View File

@@ -1,6 +1,7 @@
using LightlessSync.API.Data; using LightlessSync.API.Data;
using LightlessSync.API.Data.Enum; using LightlessSync.API.Data.Enum;
using LightlessSync.API.Dto; using LightlessSync.API.Dto;
using LightlessSync.API.Dto.Chat;
using LightlessSync.API.Dto.CharaData; using LightlessSync.API.Dto.CharaData;
using LightlessSync.API.Dto.Group; using LightlessSync.API.Dto.Group;
using LightlessSync.API.Dto.User; using LightlessSync.API.Dto.User;
@@ -21,7 +22,7 @@ public interface ILightlessHub
Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto); Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto);
Task Client_GroupPairLeft(GroupPairDto groupPairDto); Task Client_GroupPairLeft(GroupPairDto groupPairDto);
Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo); Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo);
Task Client_GroupSendProfile (GroupProfileDto groupInfo); Task Client_GroupSendProfile(GroupProfileDto groupInfo);
Task Client_GroupSendInfo(GroupInfoDto groupInfo); Task Client_GroupSendInfo(GroupInfoDto groupInfo);
Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message); Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message);
Task Client_ReceiveBroadcastPairRequest(UserPairNotificationDto dto); Task Client_ReceiveBroadcastPairRequest(UserPairNotificationDto dto);
@@ -43,8 +44,11 @@ public interface ILightlessHub
Task Client_GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto); Task Client_GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData); Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData);
Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData); Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData);
Task Client_ChatReceive(ChatMessageDto message);
Task<ConnectionDto> GetConnectionDto(); Task<ConnectionDto> GetConnectionDto();
Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
Task<IReadOnlyList<GroupChatChannelInfoDto>> GetGroupChatChannels();
Task GroupBanUser(GroupPairDto dto, string reason); Task GroupBanUser(GroupPairDto dto, string reason);
Task GroupChangeGroupPermissionState(GroupPermissionDto dto); Task GroupChangeGroupPermissionState(GroupPermissionDto dto);
@@ -105,4 +109,8 @@ public interface ILightlessHub
Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto); Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
Task GposeLobbyPushPoseData(PoseData poseData); Task GposeLobbyPushPoseData(PoseData poseData);
Task GposeLobbyPushWorldData(WorldData worldData); Task GposeLobbyPushWorldData(WorldData worldData);
Task UpdateChatPresence(ChatPresenceUpdateDto presence);
Task SendChatMessage(ChatSendRequestDto request);
Task ReportChatMessage(ChatReportSubmitDto request);
Task<ChatParticipantResolveResultDto?> ResolveChatParticipant(ChatParticipantResolveRequestDto request);
} }