diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8ee5af1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/Discord.Net"] + path = libs/Discord.Net + url = https://github.com/Serraniel/Discord.Net.git diff --git a/DML.Client/DML.Client.csproj b/DML.Client/DML.Client.csproj index 3bcc684..775b030 100644 --- a/DML.Client/DML.Client.csproj +++ b/DML.Client/DML.Client.csproj @@ -1,11 +1,12 @@ - + - netstandard1.4 + netstandard2.0 - + + diff --git a/DML.Client/DMLClient.cs b/DML.Client/DMLClient.cs index 07060f0..59fb2e3 100644 --- a/DML.Client/DMLClient.cs +++ b/DML.Client/DMLClient.cs @@ -6,7 +6,7 @@ namespace DML.Client { public static class DMLClient { - public static DiscordSocketClient Client { get; set; } = new DiscordSocketClient(new DiscordSocketConfig(){DefaultRetryMode = RetryMode.RetryRatelimit|RetryMode.RetryTimeouts}); + public static DiscordSocketClient Client { get; set; } = new DiscordSocketClient(new DiscordSocketConfig() { DefaultRetryMode = RetryMode.RetryRatelimit | RetryMode.RetryTimeouts }); public static async Task Login(string token) { diff --git a/Discord Media Loader.Application/Classes/Job.cs b/Discord Media Loader.Application/Classes/Job.cs index 1b5c8d0..ce8aa33 100644 --- a/Discord Media Loader.Application/Classes/Job.cs +++ b/Discord Media Loader.Application/Classes/Job.cs @@ -95,7 +95,7 @@ namespace DML.AppCore.Classes if (isFirst) { //messages = await channel.GetMessagesAsync(limit).ToArray() as SocketMessage[]; - var realMessages = await channel.GetMessagesAsync(limit).ToArray(); + var realMessages = await channel.GetMessagesAsync(limit).ToArrayAsync(); foreach (var realMessageArray in realMessages) { @@ -107,7 +107,7 @@ namespace DML.AppCore.Classes } else { - var realMessages = await channel.GetMessagesAsync(lastId, Direction.Before, limit).ToArray(); + var realMessages = await channel.GetMessagesAsync(lastId, Direction.Before, limit).ToArrayAsync(); foreach (var realMessageArray in realMessages) { diff --git a/Discord Media Loader.Application/DML.Application.csproj b/Discord Media Loader.Application/DML.Application.csproj index 5a56419..474cae7 100644 --- a/Discord Media Loader.Application/DML.Application.csproj +++ b/Discord Media Loader.Application/DML.Application.csproj @@ -11,6 +11,9 @@ Discord Media Loader.Application v4.6.1 512 + + + true @@ -20,6 +23,7 @@ DEBUG;TRACE prompt 4 + 8 pdbonly @@ -28,63 +32,65 @@ TRACE prompt 4 + 8 - - ..\packages\Discord.Net.Commands.1.0.2\lib\netstandard1.1\Discord.Net.Commands.dll + + ..\packages\LiteDB.4.1.4\lib\net40\LiteDB.dll - - ..\packages\Discord.Net.Core.1.0.2\lib\net45\Discord.Net.Core.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\Discord.Net.Rest.1.0.2\lib\net45\Discord.Net.Rest.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.3.1.6\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Discord.Net.Rpc.1.0.2\lib\net45\Discord.Net.Rpc.dll - - - ..\packages\Discord.Net.Webhook.1.0.2\lib\netstandard1.1\Discord.Net.Webhook.dll - - - ..\packages\Discord.Net.WebSocket.1.0.2\lib\net45\Discord.Net.WebSocket.dll - - - ..\packages\LiteDB.3.1.0\lib\net35\LiteDB.dll - True - - - ..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.1\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.6\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - - ..\packages\Microsoft.Win32.Registry.4.3.0\lib\net46\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll - - ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll - True + + ..\packages\Nito.AsyncEx.Context.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll - True + + ..\packages\Nito.AsyncEx.Coordination.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Coordination.dll - - ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll - True + + ..\packages\Nito.AsyncEx.Interop.WaitHandles.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Interop.WaitHandles.dll - - ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll - True + + ..\packages\Nito.AsyncEx.Oop.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Oop.dll - - ..\packages\SharpRaven.2.2.0\lib\net45\SharpRaven.dll + + ..\packages\Nito.AsyncEx.Tasks.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Tasks.dll + + + ..\packages\Nito.Cancellation.1.0.5\lib\netstandard2.0\Nito.Cancellation.dll + + + ..\packages\Nito.Collections.Deque.1.0.4\lib\netstandard2.0\Nito.Collections.Deque.dll + + + ..\packages\Nito.Disposables.2.1.0\lib\net461\Nito.Disposables.dll + + + ..\packages\Octokit.0.48.0\lib\net46\Octokit.dll + + + ..\packages\RestSharp.106.11.4\lib\net452\RestSharp.dll + + + ..\packages\SharpRaven.2.4.0\lib\net45\SharpRaven.dll + + + ..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll ..\packages\SweetLib.0.2.1-alpha\lib\netstandard1.3\SweetLib.dll @@ -93,24 +99,34 @@ ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll + + + ..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll + True True - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + + ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll + True + True - - ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - - ..\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll + + ..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll @@ -126,19 +142,49 @@ ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll + + ..\packages\System.Linq.Async.4.1.1\lib\net461\System.Linq.Async.dll + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + + + ..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll + True + True + + + ..\packages\System.Net.Security.4.3.2\lib\net46\System.Net.Security.dll + True + True ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll True + + ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll + - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll @@ -146,9 +192,18 @@ ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + @@ -156,11 +211,12 @@ - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - - - ..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll + ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll True + True + + + ..\packages\WebSocket4Net.0.15.2\lib\net45\WebSocket4Net.dll @@ -218,6 +274,18 @@ {045eb4a1-34e7-47e0-867e-e10c40505095} DML.Client + + {8bd82fae-47f7-41fd-a862-892c8aff8c66} + Discord.Net.Core + + + {103472c3-834d-4561-9395-6febfeb165ac} + Discord.Net.Rest + + + {58009f12-b2d9-4f1c-954b-a7cfea17dbc7} + Discord.Net.WebSocket + @@ -226,6 +294,13 @@ + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + +