minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-10 01:08:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Begun reorganizing

Browse Source
This commit is contained in:
Kwoth
2023-03-13 03:08:31 +01:00
parent 1ad0bc33af
commit 0af8048938
21 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
NadekoBot.sln
View File

@@ -35,6 +35,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Common", "src\Nadeko
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Econ", "src\Nadeko.Econ\Nadeko.Econ.csproj", "{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Cache", "src\Nadeko.Cache\Nadeko.Cache.csproj", "{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Modules.Expresssions", "src\NadekoBot.Modules.Expresssions\NadekoBot.Modules.Expresssions.csproj", "{92E239B9-C230-4475-9506-BED20174FD20}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -96,6 +100,18 @@ Global
{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37}.Release|Any CPU.Build.0 = Release|Any CPU
{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05}.Release|Any CPU.Build.0 = Release|Any CPU
{92E239B9-C230-4475-9506-BED20174FD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92E239B9-C230-4475-9506-BED20174FD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92E239B9-C230-4475-9506-BED20174FD20}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU
{92E239B9-C230-4475-9506-BED20174FD20}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU
{92E239B9-C230-4475-9506-BED20174FD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92E239B9-C230-4475-9506-BED20174FD20}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -111,6 +127,8 @@ Global
{E685977E-31A4-46F4-A5D7-4E3E39E82E43} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
{A6022F5F-A764-4D3F-847B-36F0391FF659} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
{4F4FBF7C-74F0-4AE4-B451-9E60BDCA9C37} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
{7CD45BAA-72BF-466E-AFD8-E1224A6DDC05} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
{92E239B9-C230-4475-9506-BED20174FD20} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4}

14
src/Nadeko.Cache/Nadeko.Cache.csproj Normal file
View File

@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="OneOf" Version="3.0.223" />
</ItemGroup>
</Project>

2
src/NadekoBot/Common/Cache/BotCacheExtensions.cs → src/Nadeko.Common/Cache/BotCacheExtensions.cs
View File

@@ -1,7 +1,7 @@
using OneOf;
using OneOf.Types;
namespace NadekoBot.Common;
namespace Nadeko.Common;
public static class BotCacheExtensions
{

2
src/NadekoBot/Common/Cache/IBotCache.cs → src/Nadeko.Common/Cache/IBotCache.cs
View File

@@ -1,7 +1,7 @@
using OneOf;
using OneOf.Types;
namespace NadekoBot.Common;
namespace Nadeko.Common;
public interface IBotCache
{

2
src/NadekoBot/Common/Cache/MemoryBotCache.cs → src/Nadeko.Common/Cache/MemoryBotCache.cs
View File

@@ -4,7 +4,7 @@ using OneOf.Types;
// ReSharper disable InconsistentlySynchronizedField
namespace NadekoBot.Common;
namespace Nadeko.Common;
public sealed class MemoryBotCache : IBotCache
{

2
src/NadekoBot/Common/OneOfExtensions.cs → src/Nadeko.Common/Extensions/OneOfExtensions.cs
View File

@@ -1,7 +1,7 @@
using OneOf.Types;
using OneOf;
namespace NadekoBot.Common;
namespace Nadeko.Common;
public static class OneOfExtensions
{

2
src/Nadeko.Common/Nadeko.Common.csproj
View File

@@ -7,7 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="NonBlocking" Version="2.1.1" />
<PackageReference Include="OneOf" Version="3.0.223" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
</ItemGroup>

2
src/NadekoBot/Common/PubSub/EventPubSub.cs → src/Nadeko.Common/PubSub/EventPubSub.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Common;
namespace Nadeko.Common;
public class EventPubSub : IPubSub
{

2
src/NadekoBot/Common/PubSub/IPubSub.cs → src/Nadeko.Common/PubSub/IPubSub.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Common;
namespace Nadeko.Common;
public interface IPubSub
{

2
src/NadekoBot/Common/PubSub/ISeria.cs → src/Nadeko.Common/PubSub/ISeria.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Common;
namespace Nadeko.Common;
public interface ISeria
{

2
src/NadekoBot/Common/PubSub/TypedKey.cs → src/Nadeko.Common/TypedKey.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Common;
namespace Nadeko.Common;
public readonly struct TypedKey<TData>
{

0
src/NadekoBot/Modules/Expressions/ExportedExpr.cs → src/NadekoBot.Modules.Expresssions/ExportedExpr.cs
View File

0
src/NadekoBot/Modules/Expressions/ExprField.cs → src/NadekoBot.Modules.Expresssions/ExprField.cs
View File

9
src/NadekoBot.Modules.Expresssions/NadekoBot.Modules.Expresssions.csproj Normal file
View File

@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>

0
src/NadekoBot/Modules/Expressions/NadekoExpressionExtensions.cs → src/NadekoBot.Modules.Expresssions/NadekoExpressionExtensions.cs
View File

0
src/NadekoBot/Modules/Expressions/NadekoExpressions.cs → src/NadekoBot.Modules.Expresssions/NadekoExpressions.cs
View File

0
src/NadekoBot/Modules/Expressions/NadekoExpressionsService.cs → src/NadekoBot.Modules.Expresssions/NadekoExpressionsService.cs
View File

1
src/NadekoBot.Tests/PubSubTests.cs
View File

@@ -1,4 +1,5 @@
using System.Threading.Tasks;
using Nadeko.Common;
using NadekoBot.Common;
using NUnit.Framework;
using NUnit.Framework.Internal;

4
src/NadekoBot/NadekoBot.csproj
View File

@@ -108,6 +108,7 @@
<ProjectReference Include="..\Nadeko.Econ\Nadeko.Econ.csproj" />
<ProjectReference Include="..\Nadeko.Medusa\Nadeko.Medusa.csproj" />
<ProjectReference Include="..\NadekoBot.Generators\NadekoBot.Generators.csproj" OutputItemType="Analyzer" />
<ProjectReference Include="..\NadekoBot.Modules.Expresssions\NadekoBot.Modules.Expresssions.csproj" />
</ItemGroup>
<ItemGroup>
@@ -139,6 +140,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="Modules\Expressions" />
</ItemGroup>
<PropertyGroup Condition=" '$(Version)' == '' ">
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">5.0.0</VersionPrefix>

2
src/ayu/Ayu.Discord.Voice/LibOpus.cs
View File

@@ -5,7 +5,7 @@ namespace Ayu.Discord.Voice
{
internal static unsafe class LibOpus
{
public const string OPUS = "opus";
public const string OPUS = "data/lib/opus";
[DllImport(OPUS, EntryPoint = "opus_encoder_create", CallingConvention = CallingConvention.Cdecl)]
internal static extern IntPtr CreateEncoder(int Fs, int channels, int application, out OpusError error);

2
src/ayu/Ayu.Discord.Voice/LibSodium.cs
View File

@@ -5,7 +5,7 @@ namespace Ayu.Discord.Voice
{
internal static unsafe class Sodium
{
private const string SODIUM = "libsodium";
private const string SODIUM = "data/lib/libsodium";
[DllImport(SODIUM, EntryPoint = "crypto_secretbox_easy", CallingConvention = CallingConvention.Cdecl)]
private static extern int SecretBoxEasy(byte* output, byte* input, long inputLength, byte* nonce, byte* secret);