.github/workflows/codeql-analysis.yml

@@ -1,70 +0,0 @@
-# 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

Discord Media Loader.Application/Classes/JobScheduler.cs

@@ -234,45 +234,19 @@ namespace DML.AppCore.Classes
                             var serverName = "unknown";
                             string nickname = null;
 
-                            if (fileName.Contains("%guild%") || fileName.Contains("%nickname%"))
+                            var socketTextChannel = message.Channel as SocketTextChannel;
+                            if (socketTextChannel != null)
                             {
-                                var socketTextChannel = message.Channel as SocketTextChannel;
+                                serverName = socketTextChannel.Guild.Name;
-                                if (socketTextChannel != null)
+                                serverName = Path.GetInvalidFileNameChars()
-                                {
+                                    .Aggregate(serverName, (current, c) => current.Replace(c, ' '));
-                                    // fetch servername
+                                nickname = socketTextChannel.GetUser(message.Author.Id).Nickname;
-                                    serverName = socketTextChannel.Guild.Name;
-                                    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, ' '));
 
-                            // fetch username
-                            var username = message.Author.Username;
-                            username = Path.GetInvalidFileNameChars()
-                                .Aggregate(username, (current, c) => current.Replace(c, ' '));
-
-
                             fileName =
                                 fileName.Replace("%guild%", serverName)
                                     .Replace("%channel%", channelName)
@@ -280,9 +254,9 @@ namespace DML.AppCore.Classes
                                     .Replace("%name%", a.Filename)
                                     .Replace("%id%", a.Id.ToString())
                                     .Replace("%userid%", message.Author.Id.ToString())
-                                    .Replace("%username%", username)
+                                    .Replace("%username%", message.Author.Username)
                                     .Replace("%nickname%",
-                                        !string.IsNullOrEmpty(nickname) ? nickname : username);
+                                        !string.IsNullOrEmpty(nickname) ? nickname : message.Author.Username);
 
                             if (extensionRequired)
                                 fileName += Path.GetExtension(a.Filename);

Discord Media Loader.Application/Properties/AssemblyInfo.cs

@@ -31,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.5.3.0")]
+[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]

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.5.3.0"
+#define MyAppVersion "1.5.1.0"
 #define MyAppPublisher "Serraniel"
 #define MyAppURL "https://github.com/Serraniel/DiscordMediaLoader"
 #define MyAppExeName "Discord Media Loader.exe"