summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DiscoBot.sln9
-rw-r--r--DiscoBot/Audio/Soundeffects.cs2
-rw-r--r--DiscoBot/Audio/Voice.cs4
-rw-r--r--DiscoBot/Commands/MiscCommands.cs12
-rw-r--r--DiscoBot/DiscoBot.csproj20
-rw-r--r--DiscoBot/packages.config4
6 files changed, 8 insertions, 43 deletions
diff --git a/DiscoBot.sln b/DiscoBot.sln
index b2f0851..0dc4781 100644
--- a/DiscoBot.sln
+++ b/DiscoBot.sln
@@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoBot", "DiscoBot\DiscoBot.csproj", "{1186AF1C-BC46-4B3D-BEE0-CE478B8AEAC7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spotify", "..\Spotify\Spotify.csproj", "{AEF1F22A-7209-4939-B375-3F94B82F6F8A}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -22,17 +20,10 @@ Global
{1186AF1C-BC46-4B3D-BEE0-CE478B8AEAC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1186AF1C-BC46-4B3D-BEE0-CE478B8AEAC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1186AF1C-BC46-4B3D-BEE0-CE478B8AEAC7}.Release|Any CPU.Build.0 = Release|Any CPU
- {AEF1F22A-7209-4939-B375-3F94B82F6F8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AEF1F22A-7209-4939-B375-3F94B82F6F8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AEF1F22A-7209-4939-B375-3F94B82F6F8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AEF1F22A-7209-4939-B375-3F94B82F6F8A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {AEF1F22A-7209-4939-B375-3F94B82F6F8A} = {A6857735-6707-4A33-A7F8-3A06E354D7F3}
- EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CADA01A3-B80B-4979-8397-7CB5B825CE34}
EndGlobalSection
diff --git a/DiscoBot/Audio/Soundeffects.cs b/DiscoBot/Audio/Soundeffects.cs
index 9982947..7e5e918 100644
--- a/DiscoBot/Audio/Soundeffects.cs
+++ b/DiscoBot/Audio/Soundeffects.cs
@@ -67,7 +67,7 @@
if (url != string.Empty)
{
// await Dsa.Service.SendAudioAsync(url, vol);
- await Voice.SendAsync(url, volume);
+ Voice.SendAsync(url, volume);
return;
}
diff --git a/DiscoBot/Audio/Voice.cs b/DiscoBot/Audio/Voice.cs
index f9fc7a3..84a221c 100644
--- a/DiscoBot/Audio/Voice.cs
+++ b/DiscoBot/Audio/Voice.cs
@@ -18,7 +18,7 @@
{
public static IAudioClient Client { get; set; }
- public static async Task SendAsync(string path, int volume = 256)
+ public static void SendAsync(string path, int volume = 256)
{
if (Client == null)
{
@@ -74,7 +74,7 @@
}
[Command("volume")]
- public async Task SetVolume(int volume)
+ public void SetVolume(int volume)
{
if (volume <= 100 && volume >= 0)
{
diff --git a/DiscoBot/Commands/MiscCommands.cs b/DiscoBot/Commands/MiscCommands.cs
index 551022a..8c9417c 100644
--- a/DiscoBot/Commands/MiscCommands.cs
+++ b/DiscoBot/Commands/MiscCommands.cs
@@ -51,14 +51,6 @@ namespace DiscoBot.Commands
return this.ReplyAsync(echo);
}
- [Command("spot"), Summary("Echos a message.")]
- [Alias("spotify")]
- public Task SpotiAsync([Remainder, Summary("The text to echo")] string echo)
- {
- var test = new Spotify.WebClient();
- return this.ReplyAsync(string.Join("\n", test.GetPlaylist("")));
- }
-
[Command("liebe"), Summary("Echos a message.")]
[Alias("Liebe", "<3", "love")]
public Task LoveAsync()
@@ -190,7 +182,7 @@ namespace DiscoBot.Commands
}
if(Permissions.Check(this.Context, new []{"Admin", "Mod"}))
- this.ReplyTimedAsync(sb.ToString(), TimeSpan.FromSeconds(90));
+ await this.ReplyTimedAsync(sb.ToString(), TimeSpan.FromSeconds(90));
//await this.ReplyAsync($"{count} Duplikate gefunden");
@@ -267,7 +259,7 @@ namespace DiscoBot.Commands
Antwort = Antwort + $"\nAuf unserem Server Kein Match gefunden: {quarry} \n```";
}
- ReplyAsync(Antwort);
+ await ReplyAsync(Antwort);
}
}
diff --git a/DiscoBot/DiscoBot.csproj b/DiscoBot/DiscoBot.csproj
index 18a304e..044eb45 100644
--- a/DiscoBot/DiscoBot.csproj
+++ b/DiscoBot/DiscoBot.csproj
@@ -53,11 +53,8 @@
<Reference Include="Discord.Net.WebSocket, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Discord.Net.WebSocket.1.0.2\lib\net45\Discord.Net.WebSocket.dll</HintPath>
</Reference>
- <Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
- </Reference>
- <Reference Include="HtmlAgilityPack, Version=1.4.9.4, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
- <HintPath>..\packages\HtmlAgilityPack.1.4.9.4\lib\Net45\HtmlAgilityPack.dll</HintPath>
+ <Reference Include="FSharp.Core, Version=4.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll</HintPath>
@@ -71,12 +68,6 @@
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
- <Reference Include="ScrapySharp.Core, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\ScrapySharp.2.6.2\lib\net45\ScrapySharp.Core.dll</HintPath>
- </Reference>
- <Reference Include="ScrapySharpAsync, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\ScrapySharp.2.6.2\lib\net45\ScrapySharpAsync.dll</HintPath>
- </Reference>
<Reference Include="Sodium, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\libsodium-net.0.10.0\lib\Net40\Sodium.dll</HintPath>
</Reference>
@@ -162,7 +153,6 @@
<Compile Include="Auxiliary\KampfTalent.cs" />
<Compile Include="Audio\Soundeffects.cs" />
<Compile Include="Auxiliary\Permissions.cs" />
- <Compile Include="Auxiliary\WebCrawler.cs" />
<Compile Include="Commands\MiscCommands.cs" />
<Compile Include="Auxiliary\SpellCorrect.cs" />
<Compile Include="Auxiliary\Talent.cs" />
@@ -196,12 +186,6 @@
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Spotify\Spotify.csproj">
- <Project>{aef1f22a-7209-4939-b375-3f94b82f6f8a}</Project>
- <Name>Spotify</Name>
- </ProjectReference>
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Baseclass.Contrib.Nuget.Output.2.4.3\build\Baseclass.Contrib.Nuget.Output.targets" Condition="Exists('..\packages\Baseclass.Contrib.Nuget.Output.2.4.3\build\Baseclass.Contrib.Nuget.Output.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/DiscoBot/packages.config b/DiscoBot/packages.config
index 5c47ddc..583da28 100644
--- a/DiscoBot/packages.config
+++ b/DiscoBot/packages.config
@@ -8,8 +8,7 @@
<package id="Discord.Net.Rpc" version="1.0.2" targetFramework="net461" />
<package id="Discord.Net.Webhook" version="1.0.2" targetFramework="net461" />
<package id="Discord.Net.WebSocket" version="1.0.2" targetFramework="net461" />
- <package id="FSharp.Core" version="4.0.0.1" targetFramework="net461" />
- <package id="HtmlAgilityPack" version="1.4.9.4" targetFramework="net461" />
+ <package id="FSharp.Core" version="4.3.4" targetFramework="net461" />
<package id="libsodium-net" version="0.10.0" targetFramework="net461" />
<package id="Microsoft.Extensions.DependencyInjection" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
@@ -17,7 +16,6 @@
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
<package id="NETStandard.Library" version="2.0.2" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
- <package id="ScrapySharp" version="2.6.2" targetFramework="net461" />
<package id="System.AppContext" version="4.3.0" targetFramework="net461" />
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-01 15:11:56 +0000