From 81f9b58a0ab5ee297d7b43c9442edf7c93fd2c35 Mon Sep 17 00:00:00 2001 From: ImoutoChan Date: Tue, 3 Oct 2023 04:50:50 +0400 Subject: [PATCH] Update packages --- README.RU.md | 4 ++-- README.md | 4 ++-- .../ImoutoRebirth.Arachne.Host/appSettings.json | 2 +- .../ImoutoRebirth.Arachne.Infrastructure.csproj | 4 ++-- .../LoaderFabrics/SankakuLoaderFabric.cs | 2 +- .../Models/Settings/SankakuSettings.cs | 4 ++-- .../ImoutoRebirth.Arachne.Tests.csproj | 4 ++-- ...oRebirth.Common.Domain.EntityFrameworkCore.csproj | 2 +- .../ImoutoRebirth.Common.EntityFrameworkCore.csproj | 4 ++-- .../ImoutoRebirth.Common.Infrastructure.csproj | 2 +- .../ImoutoRebirth.Common.MassTransit.csproj | 2 +- .../ImoutoRebirth.Common.OpenTelemetry.csproj | 12 ++++++------ .../ImoutoRebirth.Hasami/ImoutoRebirth.Hasami.csproj | 2 +- Source/ImoutoRebirth.Hasami/Scripts.cs | 2 +- .../ImoutoRebirth.Lilin.DataAccess.csproj | 8 ++++---- .../ImoutoRebirth.Lilin.Domain.Tests.csproj | 4 ++-- .../ImoutoRebirth.Lilin.Host.csproj | 2 +- .../ImoutoRebirth.Meido.DataAccess.csproj | 8 ++++---- .../ImoutoRebirth.Meido.Host.csproj | 2 +- .../ImoutoRebirth.Meido.UI.csproj | 2 +- .../ImoutoRebirth.Room.DataAccess.Tests.csproj | 4 ++-- .../ImoutoRebirth.Room.Database.csproj | 8 ++++---- .../ImoutoRebirth.Room.Webhost.csproj | 2 +- .../Services/ConfigurationBuilder.cs | 8 ++++---- Tools/NukeBuild/NukeBuild.csproj | 2 +- Tools/NukeBuild/configuration.json | 2 +- 26 files changed, 51 insertions(+), 51 deletions(-) diff --git a/README.RU.md b/README.RU.md index 14bcca81..971a7168 100644 --- a/README.RU.md +++ b/README.RU.md @@ -115,7 +115,7 @@ cd <путь к папке latest> "DanbooruLogin": "", "DanbooruApiKey": "", "SankakuLogin": "", - "SankakuPassHash": "", + "SankakuPassword": "", "YandereLogin": "", "YandereApiKey": "", "RoomPort": "11301", @@ -144,7 +144,7 @@ cd <путь к папке latest> | DanbooruLogin | | Крайне желательно заполнить, используется для поиска тегов и скачивания любимых картинок | | DanbooruApiKey | | Крайне желательно заполнить, находится на странице вашего профиля на danbooru, строчка API Key | | SankakuLogin | | Опционально, логин с санкаку | -| SankakuPassHash | | Опционально, sankaku pass_hash, его можжно найти в куки, после того, как вы залогинетесь на их старом сайте | +| SankakuPassword | | Опционально, sankaku password | | YandereLogin | | Крайне желательно заполнить, используется для поиска тегов и скачивания любимых картинок | | YandereApiKey | | Крайне желательно заполнить, находится на странице Profile / Settings | | RoomPort | * | Room сервис будет доступен по этому порту | diff --git a/README.md b/README.md index bdf77dee..e12d816c 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ Template and default values "DanbooruLogin": "", "DanbooruApiKey": "", "SankakuLogin": "", - "SankakuPassHash": "", + "SankakuPassword": "", "YandereLogin": "", "YandereApiKey": "", "RoomPort": "11301", @@ -144,7 +144,7 @@ Template and default values | DanbooruLogin | | Optional but recommended, only if you want ImoutoRebirth to search tags for your files in danbooru | | DanbooruApiKey | | Optional but recommended, you can find it at the end of your danbooru profile page, API Key row | | SankakuLogin | | Optional, your sankaku login | -| SankakuPassHash | | Optional, your sankaku pass_hash, you can find this value in cookies after login on their old site | +| SankakuPassword | | Optional, your sankaku password | | YandereLogin | | Optional but recommended, only if you want ImoutoRebirth to search tags for your files in yandere | | YandereApiKey | | Optional but recommended, you can find it in Profile / Settings | | RoomPort | * | Room service will be exposed through this port | diff --git a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Host/appSettings.json b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Host/appSettings.json index eddd96f3..93d3e5f4 100644 --- a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Host/appSettings.json +++ b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Host/appSettings.json @@ -6,7 +6,7 @@ }, "SankakuSettings": { "Login": "##SankakuSettings##Login##", - "PassHash": "##SankakuSettings##PassHash##", + "Password": "##SankakuSettings##Password##", "Delay": "##SankakuSettings##Delay##" }, "RabbitSettings": { diff --git a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/ImoutoRebirth.Arachne.Infrastructure.csproj b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/ImoutoRebirth.Arachne.Infrastructure.csproj index 32bc972e..17f80116 100644 --- a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/ImoutoRebirth.Arachne.Infrastructure.csproj +++ b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/ImoutoRebirth.Arachne.Infrastructure.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/LoaderFabrics/SankakuLoaderFabric.cs b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/LoaderFabrics/SankakuLoaderFabric.cs index f24fcc77..935c73de 100644 --- a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/LoaderFabrics/SankakuLoaderFabric.cs +++ b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/LoaderFabrics/SankakuLoaderFabric.cs @@ -32,7 +32,7 @@ public SankakuLoaderFabric( { PauseBetweenRequestsInMs = _settings.Delay, Login = _settings.Login, - PassHash = _settings.PassHash + Password = _settings.Password }), _sankakuAuthManager); } diff --git a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/Models/Settings/SankakuSettings.cs b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/Models/Settings/SankakuSettings.cs index 25554490..e4cece9b 100644 --- a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/Models/Settings/SankakuSettings.cs +++ b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/Models/Settings/SankakuSettings.cs @@ -2,9 +2,9 @@ public class SankakuSettings { - public string Login { get; set; } = default!; + public required string Login { get; set; } - public string PassHash { get; set; } = default!; + public required string Password { get; set; } public int Delay { get; set; } } diff --git a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Tests/ImoutoRebirth.Arachne.Tests.csproj b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Tests/ImoutoRebirth.Arachne.Tests.csproj index c4a86444..c2a70448 100644 --- a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Tests/ImoutoRebirth.Arachne.Tests.csproj +++ b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Tests/ImoutoRebirth.Arachne.Tests.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Domain.EntityFrameworkCore/ImoutoRebirth.Common.Domain.EntityFrameworkCore.csproj b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Domain.EntityFrameworkCore/ImoutoRebirth.Common.Domain.EntityFrameworkCore.csproj index 401d9c3f..76fa320b 100644 --- a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Domain.EntityFrameworkCore/ImoutoRebirth.Common.Domain.EntityFrameworkCore.csproj +++ b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Domain.EntityFrameworkCore/ImoutoRebirth.Common.Domain.EntityFrameworkCore.csproj @@ -8,7 +8,7 @@ - + diff --git a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.EntityFrameworkCore/ImoutoRebirth.Common.EntityFrameworkCore.csproj b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.EntityFrameworkCore/ImoutoRebirth.Common.EntityFrameworkCore.csproj index d5618a0b..a74491b7 100644 --- a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.EntityFrameworkCore/ImoutoRebirth.Common.EntityFrameworkCore.csproj +++ b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.EntityFrameworkCore/ImoutoRebirth.Common.EntityFrameworkCore.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Infrastructure/ImoutoRebirth.Common.Infrastructure.csproj b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Infrastructure/ImoutoRebirth.Common.Infrastructure.csproj index 7ebc7e30..b297aaed 100644 --- a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Infrastructure/ImoutoRebirth.Common.Infrastructure.csproj +++ b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Infrastructure/ImoutoRebirth.Common.Infrastructure.csproj @@ -12,7 +12,7 @@ - + diff --git a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.MassTransit/ImoutoRebirth.Common.MassTransit.csproj b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.MassTransit/ImoutoRebirth.Common.MassTransit.csproj index 69a3a4ce..3c1f85ae 100644 --- a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.MassTransit/ImoutoRebirth.Common.MassTransit.csproj +++ b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.MassTransit/ImoutoRebirth.Common.MassTransit.csproj @@ -9,7 +9,7 @@ - + diff --git a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.OpenTelemetry/ImoutoRebirth.Common.OpenTelemetry.csproj b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.OpenTelemetry/ImoutoRebirth.Common.OpenTelemetry.csproj index a9bf9adf..22605969 100644 --- a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.OpenTelemetry/ImoutoRebirth.Common.OpenTelemetry.csproj +++ b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.OpenTelemetry/ImoutoRebirth.Common.OpenTelemetry.csproj @@ -10,17 +10,17 @@ - - - - + + + + - - + + diff --git a/Source/ImoutoRebirth.Hasami/ImoutoRebirth.Hasami.csproj b/Source/ImoutoRebirth.Hasami/ImoutoRebirth.Hasami.csproj index 543d46d0..b7fae534 100644 --- a/Source/ImoutoRebirth.Hasami/ImoutoRebirth.Hasami.csproj +++ b/Source/ImoutoRebirth.Hasami/ImoutoRebirth.Hasami.csproj @@ -14,7 +14,7 @@ - + diff --git a/Source/ImoutoRebirth.Hasami/Scripts.cs b/Source/ImoutoRebirth.Hasami/Scripts.cs index deea1754..6518f35a 100644 --- a/Source/ImoutoRebirth.Hasami/Scripts.cs +++ b/Source/ImoutoRebirth.Hasami/Scripts.cs @@ -90,7 +90,7 @@ private static async Task IsFoundInAnyBooru(string md5) services.Configure(x => { x.Login = configuration.GetValue("SankakuSettings:Login"); - x.PassHash = configuration.GetValue("SankakuSettings:PassHash"); + x.Password = configuration.GetValue("SankakuSettings:Password"); x.PauseBetweenRequestsInMs = 5000; }); var provider = services.BuildServiceProvider(); diff --git a/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.DataAccess/ImoutoRebirth.Lilin.DataAccess.csproj b/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.DataAccess/ImoutoRebirth.Lilin.DataAccess.csproj index 61daa51b..0d998e70 100644 --- a/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.DataAccess/ImoutoRebirth.Lilin.DataAccess.csproj +++ b/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.DataAccess/ImoutoRebirth.Lilin.DataAccess.csproj @@ -8,13 +8,13 @@ - - + + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Domain.Tests/ImoutoRebirth.Lilin.Domain.Tests.csproj b/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Domain.Tests/ImoutoRebirth.Lilin.Domain.Tests.csproj index 72d3a08f..032915ec 100644 --- a/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Domain.Tests/ImoutoRebirth.Lilin.Domain.Tests.csproj +++ b/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Domain.Tests/ImoutoRebirth.Lilin.Domain.Tests.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Host/ImoutoRebirth.Lilin.Host.csproj b/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Host/ImoutoRebirth.Lilin.Host.csproj index 691edc5f..fe76b4a5 100644 --- a/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Host/ImoutoRebirth.Lilin.Host.csproj +++ b/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Host/ImoutoRebirth.Lilin.Host.csproj @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.DataAccess/ImoutoRebirth.Meido.DataAccess.csproj b/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.DataAccess/ImoutoRebirth.Meido.DataAccess.csproj index b7952f09..8fac2cda 100644 --- a/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.DataAccess/ImoutoRebirth.Meido.DataAccess.csproj +++ b/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.DataAccess/ImoutoRebirth.Meido.DataAccess.csproj @@ -8,13 +8,13 @@ - - + + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.Host/ImoutoRebirth.Meido.Host.csproj b/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.Host/ImoutoRebirth.Meido.Host.csproj index c7eaae92..48eefd9a 100644 --- a/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.Host/ImoutoRebirth.Meido.Host.csproj +++ b/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.Host/ImoutoRebirth.Meido.Host.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.UI/ImoutoRebirth.Meido.UI.csproj b/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.UI/ImoutoRebirth.Meido.UI.csproj index 3d23f4b0..104463b8 100644 --- a/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.UI/ImoutoRebirth.Meido.UI.csproj +++ b/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.UI/ImoutoRebirth.Meido.UI.csproj @@ -8,7 +8,7 @@ - + diff --git a/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.DataAccess.Tests/ImoutoRebirth.Room.DataAccess.Tests.csproj b/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.DataAccess.Tests/ImoutoRebirth.Room.DataAccess.Tests.csproj index 701b7d2e..633d68f2 100644 --- a/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.DataAccess.Tests/ImoutoRebirth.Room.DataAccess.Tests.csproj +++ b/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.DataAccess.Tests/ImoutoRebirth.Room.DataAccess.Tests.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers diff --git a/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Database/ImoutoRebirth.Room.Database.csproj b/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Database/ImoutoRebirth.Room.Database.csproj index 75b4e231..c7b77a7f 100644 --- a/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Database/ImoutoRebirth.Room.Database.csproj +++ b/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Database/ImoutoRebirth.Room.Database.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Webhost/ImoutoRebirth.Room.Webhost.csproj b/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Webhost/ImoutoRebirth.Room.Webhost.csproj index deb7f275..b4083e53 100644 --- a/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Webhost/ImoutoRebirth.Room.Webhost.csproj +++ b/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Webhost/ImoutoRebirth.Room.Webhost.csproj @@ -17,7 +17,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/Source/ImoutoRebirth.Tori/ImoutoRebirth.Tori/Services/ConfigurationBuilder.cs b/Source/ImoutoRebirth.Tori/ImoutoRebirth.Tori/Services/ConfigurationBuilder.cs index cd2d77b2..e6320430 100644 --- a/Source/ImoutoRebirth.Tori/ImoutoRebirth.Tori/Services/ConfigurationBuilder.cs +++ b/Source/ImoutoRebirth.Tori/ImoutoRebirth.Tori/Services/ConfigurationBuilder.cs @@ -34,7 +34,7 @@ public class ConfigurationBuilder : IConfigurationBuilder private readonly string _roomImoutoPicsUploadUrl; private readonly string _roomPort; private readonly string _sankakuLogin; - private readonly string _sankakuPassHash; + private readonly string _sankakuPassword; private readonly string _yandereApiKey; private readonly string _yandereLogin; private readonly string _jaegerHost; @@ -60,7 +60,7 @@ public ConfigurationBuilder(FileInfo globalConfigurationFile) _danbooruLogin = _configuration["DanbooruLogin"]; _danbooruApiKey = _configuration["DanbooruApiKey"]; _sankakuLogin = _configuration["SankakuLogin"]; - _sankakuPassHash = _configuration["SankakuPassHash"]; + _sankakuPassword = _configuration["SankakuPassword"]; _yandereLogin = _configuration["YandereLogin"]; _yandereApiKey = _configuration["YandereApiKey"]; @@ -132,7 +132,7 @@ private void ValidateConfigurationValues() "DanbooruLogin", "DanbooruApiKey", "SankakuLogin", - "SankakuPassHash", + "SankakuPassword", "YandereLogin", "YandereApiKey", "OpenSearchUri", @@ -172,7 +172,7 @@ private string GetArachneConfiguration(string currentVersion) }, "SankakuSettings": { "Login": "{{_sankakuLogin}}", - "PassHash": "{{_sankakuPassHash}}", + "Password": "{{_sankakuPassword}}", "Delay": "6000" }, "RabbitSettings": { diff --git a/Tools/NukeBuild/NukeBuild.csproj b/Tools/NukeBuild/NukeBuild.csproj index 9cdbedc0..0c5c2574 100644 --- a/Tools/NukeBuild/NukeBuild.csproj +++ b/Tools/NukeBuild/NukeBuild.csproj @@ -10,7 +10,7 @@ - + diff --git a/Tools/NukeBuild/configuration.json b/Tools/NukeBuild/configuration.json index 9504da65..bbbcbcf6 100644 --- a/Tools/NukeBuild/configuration.json +++ b/Tools/NukeBuild/configuration.json @@ -5,7 +5,7 @@ "DanbooruLogin": "", "DanbooruApiKey": "", "SankakuLogin": "", - "SankakuPassHash": "", + "SankakuPassword": "", "YandereLogin": "", "YandereApiKey": "", "RoomPort": "11301",