tom/hermes-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Redid stores. Added user store. Added Channel Manager, to manage data from a single channel.

Browse Source
This commit is contained in:
Tom
2024-10-19 01:50:46 +00:00
parent 3f3ba63554
commit 4d0b38babd
22 changed files with 654 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Requests/CreateTTSUser.cs
View File

@ -1,6 +1,8 @@
using System.Text.Json;
using HermesSocketLibrary.db;
using HermesSocketLibrary.Requests;
using HermesSocketServer.Models;
using HermesSocketServer.Services;
using HermesSocketServer.Store;
using ILogger = Serilog.ILogger;
@ -9,14 +11,16 @@ namespace HermesSocketServer.Requests
public class CreateTTSUser : IRequest
{
public string Name => "create_tts_user";
private ChannelManager _channels;
private Database _database;
private ChatterStore _chatters;
private readonly ServerConfiguration _configuration;
private ILogger _logger;
public CreateTTSUser(ChatterStore chatters, Database database, ILogger logger)
public CreateTTSUser(ChannelManager channels, Database database, ServerConfiguration configuration, ILogger logger)
{
_database = database;
_chatters = chatters;
_channels = channels;
_configuration = configuration;
_logger = logger;
}
@ -41,10 +45,19 @@ namespace HermesSocketServer.Requests
data["user"] = sender;
var check = await _database.ExecuteScalar("SELECT state FROM \"TtsVoiceState\" WHERE \"userId\" = @user AND \"ttsVoiceId\" = @voice", data) ?? false;
if (check is not bool state || !state)
if ((check is not bool state || !state) && chatterId != _configuration.Tts.OwnerId)
return new RequestResult(false, "Voice is disabled on this channel.");
_chatters.Set(sender, chatterId, data["voice"].ToString());
var channel = _channels.Get(sender);
if (channel == null)
return new RequestResult(false, null);
channel.Chatters.Set(chatterId.ToString(), new ChatterVoice()
{
UserId = sender,
ChatterId = chatterId.ToString(),
VoiceId = data["voice"].ToString()!
});
_logger.Information($"Selected a tts voice [voice: {data["voice"]}] for user [chatter: {data["chatter"]}] in channel [channel: {data["user"]}]");
return new RequestResult(true, null);
}

9
Requests/CreateTTSVoice.cs
View File

@ -1,5 +1,6 @@
using System.Text.Json;
using HermesSocketLibrary.Requests;
using HermesSocketServer.Models;
using HermesSocketServer.Store;
using ILogger = Serilog.ILogger;
@ -8,7 +9,7 @@ namespace HermesSocketServer.Requests
public class CreateTTSVoice : IRequest
{
public string Name => "create_tts_voice";
private IStore<string, string> _voices;
private IStore<string, Voice> _voices;
private ILogger _logger;
private Random _random;
@ -35,7 +36,11 @@ namespace HermesSocketServer.Requests
string id = RandomString(25);
_voices.Set(id, data["voice"].ToString());
_voices.Set(id, new Voice()
{
Id = id,
Name = data["voice"].ToString()!
});
_logger.Information($"Added a new voice [voice: {data["voice"]}][voice id: {id}]");
return new RequestResult(true, id);

3
Requests/DeleteTTSVoice.cs
View File

@ -1,5 +1,6 @@
using System.Text.Json;
using HermesSocketLibrary.Requests;
using HermesSocketServer.Models;
using HermesSocketServer.Store;
using ILogger = Serilog.ILogger;
@ -8,7 +9,7 @@ namespace HermesSocketServer.Requests
public class DeleteTTSVoice : IRequest
{
public string Name => "delete_tts_voice";
private IStore<string, string> _voices;
private IStore<string, Voice> _voices;
private ILogger _logger;
public DeleteTTSVoice(VoiceStore voices, ILogger logger)

14
Requests/GetTTSUsers.cs
View File

@ -1,5 +1,5 @@
using HermesSocketLibrary.Requests;
using HermesSocketServer.Store;
using HermesSocketServer.Services;
using ILogger = Serilog.ILogger;
namespace HermesSocketServer.Requests
@ -7,18 +7,22 @@ namespace HermesSocketServer.Requests
public class GetTTSUsers : IRequest
{
public string Name => "get_tts_users";
private ChatterStore _chatters;
private ChannelManager _channels;
private ILogger _logger;
public GetTTSUsers(ChatterStore chatters, ILogger logger)
public GetTTSUsers(ChannelManager channels, ILogger logger)
{
_chatters = chatters;
_channels = channels;
_logger = logger;
}
public async Task<RequestResult> Grant(string sender, IDictionary<string, object>? data)
{
var temp = _chatters.Get(sender);
var channel = _channels.Get(sender);
if (channel == null)
return new RequestResult(false, null, notifyClientsOnAccount: false);
var temp = channel.Chatters.Get().ToDictionary(p => p.Key, p => p.Value.VoiceId);
_logger.Information($"Fetched all chatters' selected tts voice for channel [channel: {sender}]");
return new RequestResult(true, temp, notifyClientsOnAccount: false);
}

18
Requests/GetTTSVoices.cs
View File

@ -1,6 +1,7 @@
using HermesSocketLibrary.db;
using HermesSocketLibrary.Requests;
using HermesSocketLibrary.Requests.Messages;
using HermesSocketServer.Store;
using ILogger = Serilog.ILogger;
namespace HermesSocketServer.Requests
@ -8,24 +9,23 @@ namespace HermesSocketServer.Requests
public class GetTTSVoices : IRequest
{
public string Name => "get_tts_voices";
private Database _database;
private VoiceStore _voices;
private ILogger _logger;
public GetTTSVoices(Database database, ILogger logger)
public GetTTSVoices(VoiceStore voices, ILogger logger)
{
_database = database;
_voices = voices;
_logger = logger;
}
public async Task<RequestResult> Grant(string sender, IDictionary<string, object>? data)
{
IList<VoiceDetails> voices = new List<VoiceDetails>();
string sql = "SELECT id, name FROM \"TtsVoice\"";
await _database.Execute(sql, (IDictionary<string, object>?) null, (r) => voices.Add(new VoiceDetails()
IEnumerable<VoiceDetails> voices = _voices.Get().Select(v => new VoiceDetails()
{
Id = r.GetString(0),
Name = r.GetString(1)
}));
Id = v.Value.Id,
Name = v.Value.Name
});
_logger.Information($"Fetched all TTS voices for channel [channel: {sender}]");
return new RequestResult(true, voices, notifyClientsOnAccount: false);
}

26
Requests/UpdateTTSUser.cs
View File

@ -1,6 +1,9 @@
using System.Text.Json;
using System.Threading.Channels;
using HermesSocketLibrary.db;
using HermesSocketLibrary.Requests;
using HermesSocketServer.Models;
using HermesSocketServer.Services;
using HermesSocketServer.Store;
using ILogger = Serilog.ILogger;
@ -10,15 +13,15 @@ namespace HermesSocketServer.Requests
{
public string Name => "update_tts_user";
private ChannelManager _channels;
private Database _database;
private readonly ServerConfiguration _configuration;
private readonly Database _database;
private ChatterStore _chatters;
private ILogger _logger;
public UpdateTTSUser(ChatterStore chatters, Database database, ServerConfiguration configuration, ILogger logger)
public UpdateTTSUser(ChannelManager channels, Database database, ServerConfiguration configuration, ILogger logger)
{
_database = database;
_chatters = chatters;
_channels = channels;
_configuration = configuration;
_logger = logger;
}
@ -39,12 +42,19 @@ namespace HermesSocketServer.Requests
data["user"] = sender;
var check = await _database.ExecuteScalar("SELECT state FROM \"TtsVoiceState\" WHERE \"userId\" = @user AND \"ttsVoiceId\" = @voice", data) ?? false;
if ((check is not bool state || !state) && chatterId != _configuration.OwnerId)
{
if ((check is not bool state || !state) && chatterId != _configuration.Tts.OwnerId)
return new RequestResult(false, null);
}
_chatters.Set(sender, chatterId, data["voice"].ToString());
var channel = _channels.Get(sender);
if (channel == null)
return new RequestResult(false, null);
channel.Chatters.Set(chatterId.ToString(), new ChatterVoice()
{
UserId = sender,
ChatterId = chatterId.ToString(),
VoiceId = data["voice"].ToString()!
});
_logger.Information($"Updated chatter's [chatter: {data["chatter"]}] selected tts voice [voice: {data["voice"]}] in channel [channel: {sender}]");
return new RequestResult(true, null);
}

9
Requests/UpdateTTSVoice.cs
View File

@ -1,5 +1,6 @@
using System.Text.Json;
using HermesSocketLibrary.Requests;
using HermesSocketServer.Models;
using HermesSocketServer.Store;
using ILogger = Serilog.ILogger;
@ -8,7 +9,7 @@ namespace HermesSocketServer.Requests
public class UpdateTTSVoice : IRequest
{
public string Name => "update_tts_voice";
private IStore<string, string> _voices;
private IStore<string, Voice> _voices;
private ILogger _logger;
public UpdateTTSVoice(VoiceStore voices, ILogger logger)
@ -30,7 +31,11 @@ namespace HermesSocketServer.Requests
if (data["voiceid"] is JsonElement id)
data["voiceid"] = id.ToString();
_voices.Set(data["voiceid"].ToString(), data["voice"].ToString());
_voices.Set(data["voiceid"].ToString(), new Voice()
{
Id = data["voiceid"].ToString()!,
Name = data["voice"].ToString()!
});
_logger.Information($"Updated voice's [voice id: {data["voiceid"]}] name [new name: {data["voice"]}]");
return new RequestResult(true, null);
}