Create codeql-analysis.yml

#107 fixed a typo to replace guild name

.github/workflows/auto-merge.yml

@@ -0,0 +1,14 @@
+name: auto-merge
+
+on:
+  pull_request:
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.3
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2.1.2
+        with:
+          target: minor
+          github-token: ${{ secrets.PR_AUTO_MERGE }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '43 14 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

DML.Client/DML.Client.csproj

@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <FileVersion>1.1.0.0</FileVersion>
+    <Version>1.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

Discord Media Loader.Application/Classes/Job.cs

@@ -6,7 +6,6 @@ using Discord;
 using Discord.WebSocket;
 using DML.Application.Classes;
 using DML.Client;
-using SweetLib.Utils;
 using SweetLib.Utils.Extensions;
 using static SweetLib.Utils.Logger.Logger;
 
@@ -18,7 +17,7 @@ namespace DML.AppCore.Classes
         public ulong GuildId { get; set; }
         public ulong ChannelId { get; set; }
         public double KnownTimestamp { get; set; } = 0;
-        private double StopTimestamp { get; set; } = 0;
+        private double StopTimestamp { get; set; }
         private bool IsValid { get; set; } = true;
 
         internal void Store()
@@ -30,14 +29,10 @@ namespace DML.AppCore.Classes
             Trace("Adding new value...");
 
             if (jobDb.Find(x => x.ChannelId == ChannelId && x.GuildId == GuildId).Any())
-            {
                 jobDb.Update(this);
-            }
             else
-            {
                 jobDb.Insert(this);
         }
-        }
 
         public void Delete()
         {
@@ -98,27 +93,20 @@ namespace DML.AppCore.Classes
                     var realMessages = await channel.GetMessagesAsync(limit).ToArrayAsync();
 
                     foreach (var realMessageArray in realMessages)
-                    {
                     foreach (var realMessage in realMessageArray)
-                        {
                         messages.Add(realMessage);
                 }
-                    }
-                }
                 else
                 {
                     var realMessages = await channel.GetMessagesAsync(lastId, Direction.Before, limit).ToArrayAsync();
 
                     foreach (var realMessageArray in realMessages)
-                    {
                     foreach (var realMessage in realMessageArray)
-                        {
                         messages.Add(realMessage);
-                        }
-                    }
 
                     //messages = await channel.GetMessagesAsync(lastId, Direction.Before, limit).ToArray() as SocketMessage[];
                 }
+
                 Trace($"Downloaded {messages.Count} messages.");
 
                 isFirst = false;
@@ -151,11 +139,13 @@ namespace DML.AppCore.Classes
                         Core.Scheduler.TotalAttachments += (ulong) m.Attachments.Count;
                         Trace($"Added message {m.Id}");
                     }
+
                     Debug($"Finished message {m.Id}");
                 }
 
                 finished = finished || messages.Count < limit;
             }
+
             Trace($"Downloaded all messages for guild {GuildId} channel {ChannelId}.");
 
             Trace("Sorting messages...");

Discord Media Loader.Application/Classes/JobScheduler.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
 using DML.Application.Classes;
-using SweetLib.Utils;
 using SweetLib.Utils.Extensions;
 using SweetLib.Utils.Logger;
 
@@ -15,14 +14,14 @@ namespace DML.AppCore.Classes
 {
     public class JobScheduler
     {
-        private ulong messageScanned = 0;
+        private ulong attachmentsDownloaded;
-        private ulong totalAttachments = 0;
+        private ulong messageScanned;
-        private ulong attachmentsDownloaded = 0;
-
-        private bool Run { get; set; } = false;
-        public List<Job> JobList { get; set; } = new List<Job>();
         public Dictionary<int, Queue<IMessage>> RunningJobs = new Dictionary<int, Queue<IMessage>>();
-        internal int RunningThreads { get; set; } = 0;
+        private ulong totalAttachments;
+
+        private bool Run { get; set; }
+        public List<Job> JobList { get; set; } = new List<Job>();
+        internal int RunningThreads { get; set; }
 
         internal ulong MessagesScanned
         {
@@ -91,7 +90,6 @@ namespace DML.AppCore.Classes
             {
                 Logger.Info("Started JobScheduler...");
                 while (Run)
-                {
                     try
                     {
                         Logger.Debug("Entering job list handler loop...");
@@ -108,6 +106,7 @@ namespace DML.AppCore.Classes
                                 Logger.Trace("Checking if job is already performed...");
                                 hasJob = RunningJobs.ContainsKey(job.Id);
                             }
+
                             Logger.Trace("Unlocked scheduler.");
 
                             if (!hasJob)
@@ -121,6 +120,7 @@ namespace DML.AppCore.Classes
                                     Logger.Trace("Adding job to running jobs.");
                                     RunningJobs.Add(job.Id, queue);
                                 }
+
                                 Logger.Trace("Unlocked scheduler.");
 
                                 Logger.Trace("Issuing job message scan...");
@@ -130,10 +130,7 @@ namespace DML.AppCore.Classes
                                     continue;
 
                                 Logger.Trace($"Adding {messages.Count} messages to queue...");
-                                foreach (var msg in messages)
+                                foreach (var msg in messages) queue.Enqueue(msg);
-                                {
-                                    queue.Enqueue(msg);
-                                }
                                 Logger.Trace($"Added {queue.Count} messages to queue.");
 
                                 if (messages.Count != queue.Count)
@@ -155,6 +152,7 @@ namespace DML.AppCore.Classes
                                         RunningThreads++;
                                         startedDownload = true;
                                     }
+
                                     Logger.Trace("Unlocked scheduler.");
                                 }
 
@@ -167,7 +165,6 @@ namespace DML.AppCore.Classes
                     {
                         Logger.Error(ex.Message);
                     }
-                }
             });
         }
 
@@ -184,6 +181,7 @@ namespace DML.AppCore.Classes
                     Logger.Warn($"Associating job not found! JobId: {jobId}");
                     return;
                 }
+
                 Logger.Trace("Found job.");
 
                 Queue<IMessage> queue;
@@ -196,8 +194,10 @@ namespace DML.AppCore.Classes
                         Logger.Warn($"Queue for job {jobId} not found!");
                         return;
                     }
+
                     Logger.Trace("Queue found.");
                 }
+
                 Logger.Trace("Unlocked scheduler.");
 
                 Logger.Debug($"Messages to process for job {jobId}: {queue.Count}");
@@ -212,8 +212,10 @@ namespace DML.AppCore.Classes
                             Logger.Warn($"Queue for job {jobId} not found!");
                             return;
                         }
+
                         Logger.Trace("Continue working...");
                     }
+
                     Logger.Trace("Unlocked scheduler.");
 
                     Logger.Trace("Dequeueing message...");
@@ -221,7 +223,6 @@ namespace DML.AppCore.Classes
 
                     Logger.Debug($"Attachments for message {message.Id}: {message.Attachments.Count}");
                     foreach (var a in message.Attachments)
-                    {
                         try
                         {
                             var fileName = Path.Combine(Core.Settings.OperatingFolder, Core.Settings.FileNameScheme);
@@ -231,16 +232,46 @@ namespace DML.AppCore.Classes
                             var extensionRequired = !fileName.EndsWith("%name%");
 
                             var serverName = "unknown";
+                            string nickname = null;
 
+                            if (fileName.Contains("%guild%") || fileName.Contains("%nickname%"))
+                            {
                                 var socketTextChannel = message.Channel as SocketTextChannel;
                                 if (socketTextChannel != null)
                                 {
+                                    // fetch servername
                                     serverName = socketTextChannel.Guild.Name;
-                                serverName = Path.GetInvalidFileNameChars().Aggregate(serverName, (current, c) => current.Replace(c, ' '));
+                                    serverName = Path.GetInvalidFileNameChars()
+                                        .Aggregate(serverName, (current, c) => current.Replace(c, ' '));
+
+                                    // fetch nickname
+                                    if (fileName.Contains("%nickname%"))
+                                    {
+                                        var serverUser =
+                                            socketTextChannel.GetUser(message.Author
+                                                .Id); // can be null if user left the server
+                                        if (serverUser != null)
+                                        {
+                                            nickname = serverUser.Nickname;
+
+                                            if (!string.IsNullOrEmpty(nickname))
+                                                nickname = Path.GetInvalidFileNameChars()
+                                                    .Aggregate(nickname, (current, c) => current.Replace(c, ' '));
+                                        }
+                                    }
+                                }
                             }
 
+                            // fetch channelname
                             var channelName = message.Channel.Name;
-                            channelName = Path.GetInvalidFileNameChars().Aggregate(channelName, (current, c) => current.Replace(c, ' '));
+                            channelName = Path.GetInvalidFileNameChars()
+                                .Aggregate(channelName, (current, c) => current.Replace(c, ' '));
+
+                            // fetch username
+                            var username = message.Author.Username;
+                            username = Path.GetInvalidFileNameChars()
+                                .Aggregate(username, (current, c) => current.Replace(c, ' '));
+
 
                             fileName =
                                 fileName.Replace("%guild%", serverName)
@@ -249,7 +280,9 @@ namespace DML.AppCore.Classes
                                     .Replace("%name%", a.Filename)
                                     .Replace("%id%", a.Id.ToString())
                                     .Replace("%userid%", message.Author.Id.ToString())
-                                    .Replace("%username%", message.Author.Username);
+                                    .Replace("%username%", username)
+                                    .Replace("%nickname%",
+                                        !string.IsNullOrEmpty(nickname) ? nickname : username);
 
                             if (extensionRequired)
                                 fileName += Path.GetExtension(a.Filename);
@@ -289,7 +322,6 @@ namespace DML.AppCore.Classes
                         }
                 }
             }
-            }
             finally
             {
                 Logger.Trace("Locking scheduler...");
@@ -300,6 +332,7 @@ namespace DML.AppCore.Classes
                     Logger.Trace("Decreasing thread count...");
                     RunningThreads--;
                 }
+
                 Logger.Trace("Unlocked scheduler.");
             }
         }

Discord Media Loader.Application/DML.Application.csproj

@@ -38,8 +38,8 @@
     <Reference Include="LiteDB, Version=4.1.4.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
       <HintPath>..\packages\LiteDB.4.1.4\lib\net40\LiteDB.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.6.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.3.1.6\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>

Discord Media Loader.Application/Helper/IdentifiedString.cs

@@ -1,22 +1,19 @@
-using System;
+namespace DML.Application.Helper
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DML.Application.Helper
 {
     internal class IdentifiedString<T>
     {
-        internal T Id { get; set; }
-        internal string Caption { get; set; }
-        
         internal IdentifiedString(T id, string caption)
         {
             Id = id;
             Caption = caption;
         }
 
-        public override string ToString() => Caption;
+        internal T Id { get; set; }
+        internal string Caption { get; set; }
+
+        public override string ToString()
+        {
+            return Caption;
+        }
     }
 }

Discord Media Loader.Application/MainForm.cs

@@ -1,37 +1,37 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using Discord;
 using Discord.WebSocket;
 using DML.AppCore.Classes;
 using DML.Application.Classes;
 using DML.Application.Helper;
+using DML.Application.Properties;
 using DML.Client;
-using static DML.Client.DMLClient;
 using static SweetLib.Utils.Logger.Logger;
 
 namespace DML.Application
 {
-    enum OnlineState
+    internal enum OnlineState
     {
         Online,
         Idle,
         DoNotDisturb,
         Invisible
     }
+
     public partial class MainForm : Form
     {
-        private bool IsInitialized { get; set; } = false;
         public MainForm()
         {
             InitializeComponent();
         }
 
-        private void MainForm_Shown(object sender, System.EventArgs e)
+        private bool IsInitialized { get; set; }
+
+        private void MainForm_Shown(object sender, EventArgs e)
         {
             Trace("MainForm shown executed.");
             RefreshComponents();
@@ -61,7 +61,8 @@ namespace DML.Application
             {
                 Trace("Adding guilds to component...");
 
-                cbGuild.Items.AddRange(DMLClient.Client.Guilds.Where(g => g.Name != null).OrderBy(g => g.Name).Select(g => new IdentifiedString<ulong>(g.Id, g.Name)).ToArray());
+                cbGuild.Items.AddRange(DMLClient.Client.Guilds.Where(g => g.Name != null).OrderBy(g => g.Name)
+                    .Select(g => new IdentifiedString<ulong>(g.Id, g.Name)).ToArray());
 
                 cbGuild.SelectedIndex = 0;
                 Trace("Guild component initialized.");
@@ -71,15 +72,14 @@ namespace DML.Application
             var oldIndex = lbxJobs.SelectedIndex;
             lbxJobs.Items.Clear();
             foreach (var job in Core.Scheduler.JobList)
-            {
+                lbxJobs.Items.Add(new IdentifiedString<int>(job.Id,
-                lbxJobs.Items.Add(new IdentifiedString<int>(job.Id, $"{FindServerById(job.GuildId)?.Name}:{FindChannelById(FindServerById(job.GuildId), job.ChannelId)?.Name}"));
+                    $"{FindServerById(job.GuildId)?.Name}:{FindChannelById(FindServerById(job.GuildId), job.ChannelId)?.Name}"));
-            }
             lbxJobs.SelectedIndex = oldIndex;
 
             lbStatus.Text = DMLClient.Client.CurrentUser.Status.ToString();
         }
 
-        private void DoSomethingChanged(object sender, System.EventArgs e)
+        private void DoSomethingChanged(object sender, EventArgs e)
         {
             Debug($"DoSomethingChanged excuted by {sender}.");
             if (!IsInitialized)
@@ -106,7 +106,7 @@ namespace DML.Application
             Info("New settings have been saved.");
         }
 
-        private void btnSearchFolders_Click(object sender, System.EventArgs e)
+        private void btnSearchFolders_Click(object sender, EventArgs e)
         {
             Trace("Operating folder button pressed.");
             using (var browserDialog = new FolderBrowserDialog())
@@ -149,7 +149,7 @@ namespace DML.Application
             return (from c in server.TextChannels where c.Id == id select c).FirstOrDefault();
         }
 
-        private void cbGuild_SelectedIndexChanged(object sender, System.EventArgs e)
+        private void cbGuild_SelectedIndexChanged(object sender, EventArgs e)
         {
             Trace("Guild index changed.");
             Debug("Updating channel dropdown component...");
@@ -166,7 +166,8 @@ namespace DML.Application
 
                     Trace("Adding new channels...");
 
-                    cbChannel.Items.AddRange(guild.TextChannels.OrderBy(c => c.Position).Select(c => new IdentifiedString<ulong>(c.Id, c.Name)).ToArray());
+                    cbChannel.Items.AddRange(guild.TextChannels.OrderBy(c => c.Position)
+                        .Select(c => new IdentifiedString<ulong>(c.Id, c.Name)).ToArray());
 
                     Trace($"Added {cbChannel.Items.Count} channels.");
 
@@ -185,7 +186,7 @@ namespace DML.Application
             Debug("Finished updating channel dropdown component.");
         }
 
-        private void btnAddJob_Click(object sender, System.EventArgs e)
+        private void btnAddJob_Click(object sender, EventArgs e)
         {
             var job = new Job
             {
@@ -204,7 +205,7 @@ namespace DML.Application
             RefreshComponents();
         }
 
-        private void btnDelete_Click(object sender, System.EventArgs e)
+        private void btnDelete_Click(object sender, EventArgs e)
         {
             Trace("Deleting job pressed.");
 
@@ -229,7 +230,7 @@ namespace DML.Application
             RefreshComponents();
         }
 
-        private void tmrRefreshProgress_Tick(object sender, System.EventArgs e)
+        private void tmrRefreshProgress_Tick(object sender, EventArgs e)
         {
             var scanned = Core.Scheduler.MessagesScanned;
             var totalAttachments = Core.Scheduler.TotalAttachments;
@@ -243,19 +244,19 @@ namespace DML.Application
             lbProgress.Text = $"Scanned: {scanned} Downloaded: {done} Open: {totalAttachments - done}";
         }
 
-        private void aboutToolStripMenuItem_Click(object sender, System.EventArgs e)
+        private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            MessageBox.Show(Properties.Resources.AboutString);
+            MessageBox.Show(Resources.AboutString);
         }
 
-        private void visitGithubToolStripMenuItem_Click(object sender, System.EventArgs e)
+        private void visitGithubToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Process.Start("https://github.com/Serraniel/DiscordMediaLoader/");
         }
 
         private async void toolStripDropDownButton1_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e)
         {
-            OnlineState state = (OnlineState)Convert.ToInt32(e.ClickedItem.Tag);
+            var state = (OnlineState) Convert.ToInt32(e.ClickedItem.Tag);
 
             lbStatus.Text = state.ToString();
             tmrTriggerRefresh.Start();
@@ -292,7 +293,7 @@ namespace DML.Application
 
         private void btnFileNameHelp_Click(object sender, EventArgs e)
         {
-            MessageBox.Show(Properties.Resources.FileNameInfo);
+            MessageBox.Show(Resources.FileNameInfo);
         }
     }
 }

Discord Media Loader.Application/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
@@ -32,5 +31,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]

Discord Media Loader.Application/Properties/Resources.Designer.cs

@@ -86,7 +86,8 @@ namespace DML.Application.Properties {
         ///%channel% -> channel name
         ///%timestamp% -> message timestamp (Unix timestamp)
         ///%name% -> attachment filename
-        ///%username% -> author name
+        ///%username% -> author username
+        ///%nickname% -> author nickname (if unassigned, username will be used)
         ///%id% -> attachment id (given by Discord)
         ///%userid% -> author id (given by discord) ähnelt.
         /// </summary>

Discord Media Loader.Application/Properties/Resources.resx

@@ -139,7 +139,8 @@ Flaticons (Roundicons Circle Flat) - Flaticon Basic License</value>
 %channel% -&gt; channel name
 %timestamp% -&gt; message timestamp (Unix timestamp)
 %name% -&gt; attachment filename
-%username% -&gt; author name
+%username% -&gt; author username
+%nickname% -&gt; author nickname (if unassigned, username will be used)
 %id% -&gt; attachment id (given by Discord)
 %userid% -&gt; author id (given by discord)</value>
   </data>

Discord Media Loader.Application/app.config

@@ -62,6 +62,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

Discord Media Loader.Application/packages.config

@@ -1,84 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LiteDB" version="4.1.4" targetFramework="net461" />
+  <package id="LiteDB" version="5.0.9" targetFramework="net461" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.1" targetFramework="net461" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="3.1.6" targetFramework="net461" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.6" targetFramework="net461" />
-  <package id="Microsoft.NETCore.Platforms" version="3.1.1" targetFramework="net461" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
-  <package id="Microsoft.Win32.Registry" version="4.7.0" targetFramework="net461" />
+  <package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net461" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
-  <package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Coordination" version="5.0.0" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Interop.WaitHandles" version="5.0.0" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Oop" version="5.0.0" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Tasks" version="5.0.0" targetFramework="net461" />
-  <package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
-  <package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
-  <package id="Nito.Disposables" version="2.1.0" targetFramework="net461" />
-  <package id="Octokit" version="0.48.0" targetFramework="net461" />
-  <package id="RestSharp" version="106.11.4" targetFramework="net461" />
   <package id="SharpRaven" version="2.4.0" targetFramework="net461" />
-  <package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net461" />
   <package id="SweetLib" version="0.2.1-alpha" targetFramework="net461" />
-  <package id="System.AppContext" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="5.0.0" targetFramework="net461" />
-  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
-  <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net461" />
-  <package id="System.ComponentModel" version="4.3.0" targetFramework="net461" />
-  <package id="System.Console" version="4.3.1" targetFramework="net461" />
-  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net461" />
-  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
-  <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
-  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net461" />
-  <package id="System.Interactive.Async" version="4.0.0" targetFramework="net461" />
-  <package id="System.IO" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
-  <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
-  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net461" />
-  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
-  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Linq" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Linq.Async" version="4.1.1" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Memory" version="4.5.4" targetFramework="net461" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net461" />
-  <package id="System.Net.NameResolution" version="4.3.0" targetFramework="net461" />
-  <package id="System.Net.Primitives" version="4.3.1" targetFramework="net461" />
   <package id="System.Net.Security" version="4.3.2" targetFramework="net461" />
-  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
-  <package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net461" />
-  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime" version="4.3.1" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net461" />
-  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net461" />
-  <package id="System.Security.AccessControl" version="4.7.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
-  <package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net461" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
-  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
-  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net461" />
-  <package id="System.Threading" version="4.3.0" targetFramework="net461" />
-  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
-  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
-  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net461" />
-  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
-  <package id="WebSocket4Net" version="0.15.2" targetFramework="net461" />
 </packages>

Discord Media Loader/App.config

@@ -65,6 +65,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Discord Media Loader/Discord Media Loader.csproj

@@ -42,8 +42,8 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.6.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.3.1.6\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>

Discord Media Loader/Program.cs

@@ -5,24 +5,20 @@ using Nito.AsyncEx;
 
 namespace Discord_Media_Loader
 {
-    static class Program
+    internal static class Program
     {
         [STAThread]
-        static void Main(string[] paramStrings)
+        private static void Main(string[] paramStrings)
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
             var splashScreen = new FrmSplash();
             if (splashScreen.ShowDialog() == DialogResult.OK)
-            {
                 DoLaunch(paramStrings);
-            }
             else
-            {
                 Application.Restart();
         }
-        }
 
         private static void DoLaunch(string[] paramStrings)
         {

Discord Media Loader/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
@@ -32,5 +31,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]

Discord Media Loader/packages.config

@@ -1,72 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.1" targetFramework="net461" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="3.1.6" targetFramework="net461" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.6" targetFramework="net461" />
-  <package id="Microsoft.NETCore.Platforms" version="3.1.1" targetFramework="net461" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
-  <package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
+  <package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
+  <package id="Nito.AsyncEx.Context" version="5.1.2" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Coordination" version="5.0.0" targetFramework="net461" />
+  <package id="Nito.AsyncEx.Coordination" version="5.1.2" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Interop.WaitHandles" version="5.0.0" targetFramework="net461" />
+  <package id="Nito.AsyncEx.Interop.WaitHandles" version="5.1.2" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Oop" version="5.0.0" targetFramework="net461" />
+  <package id="Nito.AsyncEx.Oop" version="5.1.2" targetFramework="net461" />
-  <package id="Nito.AsyncEx.Tasks" version="5.0.0" targetFramework="net461" />
+  <package id="Nito.AsyncEx.Tasks" version="5.1.2" targetFramework="net461" />
-  <package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
+  <package id="Nito.Cancellation" version="1.1.2" targetFramework="net461" />
-  <package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
+  <package id="Nito.Collections.Deque" version="1.1.1" targetFramework="net461" />
-  <package id="Nito.Disposables" version="2.1.0" targetFramework="net461" />
+  <package id="Nito.Disposables" version="2.2.1" targetFramework="net461" />
-  <package id="Octokit" version="0.48.0" targetFramework="net461" />
+  <package id="Octokit" version="0.50.0" targetFramework="net461" />
-  <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="5.0.0" targetFramework="net461" />
-  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
-  <package id="System.ComponentModel" version="4.3.0" targetFramework="net461" />
-  <package id="System.Console" version="4.3.1" targetFramework="net461" />
-  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net461" />
-  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" />
-  <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
-  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net461" />
-  <package id="System.Interactive.Async" version="4.0.0" targetFramework="net461" />
-  <package id="System.IO" version="4.3.0" targetFramework="net461" />
-  <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
-  <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net461" />
-  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
-  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Linq" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq.Async" version="4.1.1" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
   <package id="System.Memory" version="4.5.4" targetFramework="net461" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net461" />
-  <package id="System.Net.Primitives" version="4.3.1" targetFramework="net461" />
-  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
-  <package id="System.ObjectModel" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net461" />
-  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime" version="4.3.1" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net461" />
-  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
-  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
-  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
-  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
-  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net461" />
-  <package id="System.Threading" version="4.3.0" targetFramework="net461" />
-  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
-  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
-  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net461" />
-  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
 </packages>

README.md

@@ -4,7 +4,7 @@
 
 *Discord Media Loader* is a small tool for downloading all attachments of *Discord* servers. 
 
-**[Downloadlatest release](https://github.com/Serraniel/DiscordMediaLoader/releases)** or install with *winget*: `winget install Serraniel.DiscordMediaLoder -e`.
+**[Downloadlatest release](https://github.com/Serraniel/DiscordMediaLoader/releases)** or install with *winget*: `winget install -e --id Serraniel.DiscordMediaLoader`.
 
 **Build:** [![build status badge](https://ci.serraniel.com/app/rest/builds/buildType:(DiscordMediaLoader_BuildMaster)/statusIcon)](https://ci.serraniel.com/viewType.html?buildTypeId=DiscordMediaLoader_BuildMaster)
 

install/install.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Discord Media Loader"
-#define MyAppVersion "1.4.0.0"
+#define MyAppVersion "1.5.3.0"
 #define MyAppPublisher "Serraniel"
 #define MyAppURL "https://github.com/Serraniel/DiscordMediaLoader"
 #define MyAppExeName "Discord Media Loader.exe"
@@ -39,36 +39,66 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 6.1; Check: not IsAdminInstallMode
 
 [Files]
-Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.Application.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.Application.dll.config"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.Application.pdb"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.exe.config"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.pdb"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.Core.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.Core.pdb"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.Core.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.Rest.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.Rest.pdb"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.Rest.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.WebSocket.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.WebSocket.pdb"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord.Net.WebSocket.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\DML.Client.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\DML.Client.pdb"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\LiteDB.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\LiteDB.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Bcl.AsyncInterfaces.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Bcl.AsyncInterfaces.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Extensions.DependencyInjection.Abstractions.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Extensions.DependencyInjection.Abstractions.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Extensions.DependencyInjection.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Extensions.DependencyInjection.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Win32.Primitives.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Win32.Registry.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Microsoft.Win32.Registry.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\netstandard.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Newtonsoft.Json.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Context.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Context.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Coordination.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Coordination.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Interop.WaitHandles.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Interop.WaitHandles.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Oop.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Oop.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Tasks.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.AsyncEx.Tasks.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.Cancellation.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.Cancellation.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.Collections.Deque.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.Collections.Deque.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.Disposables.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Nito.Disposables.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Octokit.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Octokit.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\SharpRaven.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\SweetLib.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\SweetLib.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.AppContext.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Buffers.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Buffers.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Collections.Concurrent.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Collections.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Collections.Immutable.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Collections.Immutable.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Collections.NonGeneric.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Collections.Specialized.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.ComponentModel.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -80,6 +110,7 @@ Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media L
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Diagnostics.Contracts.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Diagnostics.Debug.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Diagnostics.DiagnosticSource.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Diagnostics.DiagnosticSource.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Diagnostics.FileVersionInfo.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Diagnostics.Process.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Diagnostics.StackTrace.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -92,7 +123,6 @@ Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media L
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Globalization.Calendars.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Globalization.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Globalization.Extensions.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Interactive.Async.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.IO.Compression.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.IO.Compression.ZipFile.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.IO.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -105,11 +135,13 @@ Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media L
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.IO.Pipes.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.IO.UnmanagedMemoryStream.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Linq.Async.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Linq.Async.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Linq.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Linq.Expressions.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Linq.Parallel.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Linq.Queryable.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Memory.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Memory.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Net.Http.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Net.NameResolution.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Net.NetworkInformation.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -122,6 +154,7 @@ Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media L
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Net.WebSockets.Client.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Net.WebSockets.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Numerics.Vectors.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Numerics.Vectors.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.ObjectModel.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Reflection.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Reflection.Extensions.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -130,6 +163,7 @@ Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media L
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Resources.ResourceManager.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Resources.Writer.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Runtime.CompilerServices.Unsafe.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Runtime.CompilerServices.Unsafe.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Runtime.CompilerServices.VisualC.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Runtime.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Runtime.Extensions.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -156,6 +190,7 @@ Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media L
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Threading.Overlapped.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Threading.Tasks.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Threading.Tasks.Extensions.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Threading.Tasks.Extensions.xml"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Threading.Tasks.Parallel.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Threading.Thread.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Threading.ThreadPool.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -167,10 +202,6 @@ Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media L
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Xml.XmlSerializer.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Xml.XPath.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\System.Xml.XPath.XDocument.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.Application.dll.config"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Daniel\Documents\Projects\Discord Media Loader\Discord Media Loader\bin\Release\Discord Media Loader.exe.config"; DestDir: "{app}"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
@@ -181,3 +212,5 @@ Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Fil
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
+
+

libs/Discord.Net

@@ -1 +1 @@
-Subproject commit 06155e03a23e9fca0c865f65d0675d3dd79c90a8
+Subproject commit 373318d3eae295f789c11a24948d86690db91a0f