Fixed adding, modifying and fetching TTS filters.
This commit is contained in:
@ -56,7 +56,7 @@ namespace TwitchChatTTS.Hermes.Socket.Handlers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var re = new Regex(filter.Search!, RegexOptions.Compiled);
|
var re = new Regex(filter.Search!, ((RegexOptions) filter.Flag) | RegexOptions.Compiled);
|
||||||
re.Match(string.Empty);
|
re.Match(string.Empty);
|
||||||
filter.Regex = re;
|
filter.Regex = re;
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
using HermesSocketLibrary.Requests.Messages;
|
using HermesSocketLibrary.Requests.Messages;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
|
|
||||||
@ -33,6 +34,14 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var re = new Regex(filter.Search!, ((RegexOptions)filter.Flag) | RegexOptions.Compiled);
|
||||||
|
re.Match(string.Empty);
|
||||||
|
filter.Regex = re;
|
||||||
|
}
|
||||||
|
catch (Exception) { }
|
||||||
|
|
||||||
_logger.Debug($"Filter data [filter id: {filter.Id}][search: {filter.Search}][replace: {filter.Replace}]");
|
_logger.Debug($"Filter data [filter id: {filter.Id}][search: {filter.Search}][replace: {filter.Replace}]");
|
||||||
_user.RegexFilters.Add(filter);
|
_user.RegexFilters.Add(filter);
|
||||||
_logger.Information($"Filter has been created [filter id: {filter.Id}]");
|
_logger.Information($"Filter has been created [filter id: {filter.Id}]");
|
||||||
|
@ -33,7 +33,7 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var re = new Regex(filter.Search!, RegexOptions.Compiled);
|
var re = new Regex(filter.Search!, ((RegexOptions) filter.Flag) | RegexOptions.Compiled);
|
||||||
re.Match(string.Empty);
|
re.Match(string.Empty);
|
||||||
filter.Regex = re;
|
filter.Regex = re;
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
using HermesSocketLibrary.Requests.Messages;
|
using HermesSocketLibrary.Requests.Messages;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
|
|
||||||
@ -28,15 +29,25 @@ namespace TwitchChatTTS.Hermes.Socket.Requests
|
|||||||
}
|
}
|
||||||
|
|
||||||
_logger.Debug($"Filter data [filter id: {filter.Id}][search: {filter.Search}][group id: {filter.Replace}]");
|
_logger.Debug($"Filter data [filter id: {filter.Id}][search: {filter.Search}][group id: {filter.Replace}]");
|
||||||
var previous = _user.RegexFilters.FirstOrDefault(f => f.Id == filter.Id);
|
var current = _user.RegexFilters.FirstOrDefault(f => f.Id == filter.Id);
|
||||||
if (previous == null)
|
if (current == null)
|
||||||
{
|
{
|
||||||
_logger.Warning($"TTS Filter doest exist by id [filter id: {filter.Id}]");
|
_logger.Warning($"TTS Filter doest exist by id [filter id: {filter.Id}]");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
previous.Search = filter.Search;
|
current.Search = filter.Search;
|
||||||
previous.Replace = filter.Replace;
|
current.Replace = filter.Replace;
|
||||||
|
current.Flag = filter.Flag;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var re = new Regex(current.Search!, ((RegexOptions)current.Flag) | RegexOptions.Compiled);
|
||||||
|
re.Match(string.Empty);
|
||||||
|
current.Regex = re;
|
||||||
|
}
|
||||||
|
catch (Exception) { }
|
||||||
|
|
||||||
_logger.Information($"Filter has been updated [filter id: {filter.Id}]");
|
_logger.Information($"Filter has been updated [filter id: {filter.Id}]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user