Compare commits

4 Commits

4 changed files with 34 additions and 7 deletions

View File

@@ -12,6 +12,7 @@ public class MareConfig : IMareConfiguration
public bool AcceptedAgreement { get; set; } = false; public bool AcceptedAgreement { get; set; } = false;
public string CacheFolder { get; set; } = string.Empty; public string CacheFolder { get; set; } = string.Empty;
public bool DisableOptionalPluginWarnings { get; set; } = false; public bool DisableOptionalPluginWarnings { get; set; } = false;
public LocalizationLanguage Language { get; set; } = LocalizationLanguage.French;
public bool EnableDtrEntry { get; set; } = true; public bool EnableDtrEntry { get; set; } = true;
public int DtrStyle { get; set; } = 0; public int DtrStyle { get; set; } = 0;
public bool ShowUidInDtrTooltip { get; set; } = true; public bool ShowUidInDtrTooltip { get; set; } = true;

View File

@@ -0,0 +1,7 @@
namespace MareSynchronos.MareConfiguration.Models;
public enum LocalizationLanguage
{
French = 0,
English = 1,
}

View File

@@ -210,9 +210,16 @@ public sealed class PairManager : DisposableMediatorSubscriberBase
public void SetGroupInfo(GroupInfoDto dto) public void SetGroupInfo(GroupInfoDto dto)
{ {
_allGroups[dto.Group].Group = dto.Group; if (!_allGroups.TryGetValue(dto.Group, out var groupInfo))
_allGroups[dto.Group].Owner = dto.Owner; {
_allGroups[dto.Group].GroupPermissions = dto.GroupPermissions; return;
}
groupInfo.Group = dto.Group;
groupInfo.Owner = dto.Owner;
groupInfo.GroupPermissions = dto.GroupPermissions;
groupInfo.IsTemporary = dto.IsTemporary;
groupInfo.ExpiresAt = dto.ExpiresAt;
RecreateLazy(); RecreateLazy();
} }

View File

@@ -1,4 +1,5 @@
using MareSynchronos.API.Data; using System;
using MareSynchronos.API.Data;
using MareSynchronos.API.Dto.Group; using MareSynchronos.API.Dto.Group;
using MareSynchronos.WebAPI.SignalR.Utils; using MareSynchronos.WebAPI.SignalR.Utils;
using Microsoft.AspNetCore.SignalR.Client; using Microsoft.AspNetCore.SignalR.Client;
@@ -49,12 +50,23 @@ public partial class ApiController
await _mareHub!.SendAsync(nameof(GroupClear), group).ConfigureAwait(false); await _mareHub!.SendAsync(nameof(GroupClear), group).ConfigureAwait(false);
} }
public async Task<GroupPasswordDto> GroupCreate(string? alias = null) public Task<GroupPasswordDto> GroupCreate()
{
return GroupCreate(null);
}
public async Task<GroupPasswordDto> GroupCreate(string? alias)
{ {
CheckConnection(); CheckConnection();
return await _mareHub!.InvokeAsync<GroupPasswordDto>(nameof(GroupCreate), string.IsNullOrWhiteSpace(alias) ? null : alias.Trim()).ConfigureAwait(false); return await _mareHub!.InvokeAsync<GroupPasswordDto>(nameof(GroupCreate), string.IsNullOrWhiteSpace(alias) ? null : alias.Trim()).ConfigureAwait(false);
} }
public async Task<GroupPasswordDto> GroupCreateTemporary(DateTime expiresAtUtc)
{
CheckConnection();
return await _mareHub!.InvokeAsync<GroupPasswordDto>(nameof(GroupCreateTemporary), expiresAtUtc).ConfigureAwait(false);
}
public async Task<List<string>> GroupCreateTempInvite(GroupDto group, int amount) public async Task<List<string>> GroupCreateTempInvite(GroupDto group, int amount)
{ {
CheckConnection(); CheckConnection();