Unban work

LightlessSyncAPI/Data/GroupData.cs

@@ -3,8 +3,8 @@
 namespace LightlessSync.API.Data;
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record GroupData(string GID, string? Alias = null, DateTime? CreatedAt = null)
+public record GroupData(string GID, string? Alias = null)
 {
     [IgnoreMember]
-    public string AliasOrGID => Alias ?? GID;
+    public string AliasOrGID => string.IsNullOrWhiteSpace(Alias) ? GID : Alias;
 }

LightlessSyncAPI/Data/UserData.cs

@@ -3,7 +3,7 @@
 namespace LightlessSync.API.Data;
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record UserData(string UID, string? Alias = null, bool IsAdmin = false, bool IsModerator = false)
+public record UserData(string UID, string? Alias = null)
 {
     [IgnoreMember]
     public string AliasOrUID => string.IsNullOrWhiteSpace(Alias) ? UID : Alias;

LightlessSyncAPI/Dto/Group/GroupBroadcastRequestDto.cs

@@ -1,11 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.Group;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public sealed class GroupBroadcastRequestDto
-{
-    public required string GID { get; init; }
-    public string? HashedCID { get; set; }
-    public required bool Enabled { get; init; }
-}

LightlessSyncAPI/Dto/Group/GroupJoinDto.cs

@@ -8,4 +8,4 @@ namespace LightlessSync.API.Dto.Group;
 public record GroupPasswordDto(GroupData Group, string Password) : GroupDto(Group);
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record GroupJoinDto(GroupData Group, string Password, GroupUserPreferredPermissions GroupUserPreferredPermissions, bool Finder = false) : GroupPasswordDto(Group, Password);
+public record GroupJoinDto(GroupData Group, string Password, GroupUserPreferredPermissions GroupUserPreferredPermissions) : GroupPasswordDto(Group, Password);

LightlessSyncAPI/Dto/Group/GroupJoinHashedDto.cs

@@ -1,12 +0,0 @@
-using LightlessSync.API.Data;
-using LightlessSync.API.Data.Enum;
-using MessagePack;
-
-namespace LightlessSync.API.Dto.Group;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public record GroupJoinHashedDto(
-    GroupData Group,
-    string HashedPassword,
-    GroupUserPreferredPermissions GroupUserPreferredPermissions
-);

LightlessSyncAPI/Dto/Group/GroupPairDto.cs

@@ -9,5 +9,4 @@ public record GroupPairDto(GroupData Group, UserData User) : GroupDto(Group)
     public string UID => User.UID;
     public string? UserAlias => User.Alias;
     public string UserAliasOrUID => User.AliasOrUID;
-
 }

LightlessSyncAPI/Dto/Group/GroupProfileDto.cs

@@ -1,6 +0,0 @@
-using LightlessSync.API.Data;
-
-namespace LightlessSync.API.Dto.Group
-{
-    public record GroupProfileDto(GroupData Group, string? Description, string? Tags, string? PictureBase64) : GroupDto(Group);
-}

LightlessSyncAPI/Dto/User/BanRequest.cs

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

LightlessSyncAPI/Dto/User/BroadcastStatusBatchDto.cs

@@ -1,9 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public sealed class BroadcastStatusBatchDto
-{
-    public Dictionary<string, BroadcastStatusInfoDto> Results { get; init; } = new();
-}

LightlessSyncAPI/Dto/User/BroadcastStatusInfoDto.cs

@@ -1,12 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public sealed class BroadcastStatusInfoDto
-{
-    public required string HashedCID { get; init; }
-    public required bool IsBroadcasting { get; init; }
-    public TimeSpan? TTL { get; init; }
-    public string? GID { get; init; }
-}

LightlessSyncAPI/Dto/User/BroadcastStatusRequestDto.cs

@@ -1,12 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public sealed class BroadcastStatusRequestDto
-{
-    public required string HashedCID { get; init; }
-    public required bool Enabled { get; init; }
-    public string? GID { get; init; }
-}
-

LightlessSyncAPI/Dto/User/UnbanRequest.cs

@@ -1,9 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-[MessagePackObject(keyAsPropertyName: true)]
-public record UnbanRequest(string? Uid, string? DiscordId)
-{
-    public bool IsValid => !string.IsNullOrEmpty(Uid) || !string.IsNullOrEmpty(DiscordId);
-}
-

LightlessSyncAPI/Routes/LightlessAuth.cs

@@ -15,7 +15,6 @@ public class LightlessAuth
     public const string User = "/user";
     public const string User_Unban_Discord = "unbanDiscord";
     public const string User_Unban_Uid = "unbanUID";
-    public const string Ban_Uid = "ban";
     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/SignalR/ILightlessHub.cs

@@ -21,7 +21,6 @@ public interface ILightlessHub
     Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto);
     Task Client_GroupPairLeft(GroupPairDto groupPairDto);
     Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo);
-    Task Client_GroupSendProfile (GroupProfileDto groupInfo);
     Task Client_GroupSendInfo(GroupInfoDto groupInfo);
     Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message);
     Task Client_UpdateSystemInfo(SystemInfoDto systemInfo);
@@ -56,26 +55,14 @@ public interface ILightlessHub
     Task<List<BannedGroupUserDto>> GroupGetBannedUsers(GroupDto group);
     Task<GroupJoinInfoDto> GroupJoin(GroupPasswordDto passwordedGroup);
     Task<bool> GroupJoinFinalize(GroupJoinDto passwordedGroup);
-    Task<GroupJoinInfoDto> GroupJoinHashed(GroupJoinHashedDto dto);
     Task GroupLeave(GroupDto group);
     Task GroupRemoveUser(GroupPairDto groupPair);
-    Task<GroupProfileDto> GroupGetProfile(GroupDto dto);
-    Task GroupSetProfile(GroupProfileDto dto);
     Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
     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 SetBroadcastStatus(string hashedCid, 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 UserDelete();
     Task<List<OnlineUserIdentDto>> UserGetOnlinePairs(CensusDataDto? censusDataDto);
     Task<List<UserFullPairDto>> UserGetPairedClients();