Release v1.4.1

DiscordBot/DiscordBot.csproj

@@ -15,7 +15,7 @@
     <RepositoryUrl>https://github.com/DevSubmarine/DiscordBot</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>bot; discord; devsub; devsubmarine</PackageTags>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -73,7 +73,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net" Version="3.11.0" />
+    <PackageReference Include="Discord.Net" Version="3.12.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />

DiscordBot/Features/BlogsManagement/BlogChannelPermissionsOptions.cs

@@ -0,0 +1,36 @@
+using Discord;
+
+namespace DevSubmarine.DiscordBot.BlogsManagement
+{
+    public class BlogChannelPermissionsOptions
+    {
+        public ulong TargetID { get; set; }
+        public PermissionTarget TargetType { get; set; } = PermissionTarget.User;
+        public PermissionValues Permissions { get; set; } = new PermissionValues();
+
+        public class PermissionValues
+        {
+            public bool? ViewChannel { get; set; }
+            public bool? ManageChannel { get; set; }
+            public bool? ManagePermissions { get; set; }
+            public bool? ManageWebhooks { get; set; }
+            public bool? CreateInvite { get; set; }
+            public bool? SendMessages { get; set; }
+            public bool? SendMessagesInThreads { get; set; }
+            public bool? CreatePublicThreads { get; set; }
+            public bool? CreatePrivateThreads { get; set; }
+            public bool? EmbedLinks { get; set; }
+            public bool? AttachFiles { get; set; }
+            public bool? AddReactions { get; set; }
+            public bool? UseExternalEmojis { get; set; }
+            public bool? UseExternalStickers { get; set; }
+            public bool? MentionEveryone { get; set; }
+            public bool? ManageMessages { get; set; }
+            public bool? ManageThreads { get; set; }
+            public bool? ReadMessageHistory { get; set; }
+            public bool? SendTTSMessages { get; set; }
+            public bool? UseApplicationCommands { get; set; }
+            public bool? UseActivities { get; set; }
+        }
+    }
+}

DiscordBot/Features/BlogsManagement/BlogsManagementOptions.cs

@@ -20,5 +20,9 @@ public class BlogsManagementOptions
         /// <summary>Words that cannot be contained in blog channel name.</summary>
         /// <remarks>This can be used to forbid certain words, such as swears or whatever.</remarks>
         public IEnumerable<string> ForbiddenChannelNameWords { get; set; }
+
+        public BlogChannelPermissionsOptions.PermissionValues EveryonePermissions { get; set; }
+        public BlogChannelPermissionsOptions.PermissionValues OwnerPermissions { get; set; }
+        public IEnumerable<BlogChannelPermissionsOptions> AdditionalPermissions { get; set; }
     }
 }

DiscordBot/Features/BlogsManagement/Services/BlogChannelManager.cs

@@ -83,23 +83,20 @@ public async Task<IGuildChannel> CreateBlogChannel(string name, IEnumerable<ulon
 
                 List<Overwrite> perms = new List<Overwrite>(category.PermissionOverwrites);
                 props.PermissionOverwrites = perms;
-                perms.Add(new Overwrite(guild.EveryoneRole.Id, PermissionTarget.Role,
-                            categoryPerms.Modify(sendMessages: PermValue.Deny)));
+                perms.Add(new Overwrite(guild.EveryoneRole.Id, PermissionTarget.Role, ModifyWith(categoryPerms, this._options.EveryonePermissions)));
+
                 foreach (ulong uid in userIDs)
-                {
-                    perms.Add(new Overwrite(uid, PermissionTarget.User, categoryPerms.Modify(
-                        sendMessages: PermValue.Allow,
-                        manageMessages: PermValue.Allow,
-                        manageWebhooks: PermValue.Allow
-                    )));
-                }
+                    perms.Add(new Overwrite(uid, PermissionTarget.User, ModifyWith(categoryPerms, this._options.OwnerPermissions)));
+
+                foreach (BlogChannelPermissionsOptions additionalPerms in this._options.AdditionalPermissions ?? Enumerable.Empty<BlogChannelPermissionsOptions>())
+                    perms.Add(new Overwrite(additionalPerms.TargetID, additionalPerms.TargetType, ModifyWith(categoryPerms, additionalPerms.Permissions)));
 
                 props.IsNsfw = properties.NSFW;
             }, 
             cancellationToken.ToRequestOptions());
 
             this._log.LogTrace("Sorting channels");
-            await Task.Delay(TimeSpan.FromSeconds(1));
+            await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken).ConfigureAwait(false);
             await this._sorter.SortChannelsAsync(category, cancellationToken).ConfigureAwait(false);
 
             this._log.LogDebug("Channel {ChannelName} ({ChannelID}) created", result.Name, result.Id);
@@ -118,5 +115,44 @@ public Task EditBlogChannel(IGuildChannel channel, BlogChannelProperties propert
             },
             cancellationToken.ToRequestOptions());
         }
+
+        private static OverwritePermissions ModifyWith(OverwritePermissions permissions, BlogChannelPermissionsOptions.PermissionValues options)
+        {
+            if (options == null)
+                return permissions;
+
+            return permissions.Modify(
+                viewChannel: AsPermValue(options.ViewChannel),
+                manageChannel: AsPermValue(options.ManageChannel),
+                manageRoles: AsPermValue(options.ManagePermissions),
+                manageWebhooks: AsPermValue(options.ManageWebhooks),
+                createInstantInvite: AsPermValue(options.CreateInvite),
+                sendMessages: AsPermValue(options.SendMessages),
+                sendMessagesInThreads: AsPermValue(options.SendMessagesInThreads),
+                createPublicThreads: AsPermValue(options.CreatePublicThreads),
+                createPrivateThreads: AsPermValue(options.CreatePrivateThreads),
+                embedLinks: AsPermValue(options.EmbedLinks),
+                attachFiles: AsPermValue(options.AttachFiles),
+                addReactions: AsPermValue(options.AddReactions),
+                useExternalEmojis: AsPermValue(options.UseExternalEmojis),
+                useExternalStickers: AsPermValue(options.UseExternalStickers),
+                mentionEveryone: AsPermValue(options.MentionEveryone),
+                manageMessages: AsPermValue(options.ManageMessages),
+                manageThreads: AsPermValue(options.ManageThreads),
+                readMessageHistory: AsPermValue(options.ReadMessageHistory),
+                sendTTSMessages: AsPermValue(options.SendTTSMessages),
+                useApplicationCommands: AsPermValue(options.UseApplicationCommands),
+                startEmbeddedActivities: AsPermValue(options.UseActivities));
+
+            PermValue? AsPermValue(bool? value)
+            {
+                return value switch
+                {
+                    true => PermValue.Allow,
+                    false => PermValue.Deny,
+                    _ => null
+                };
+            }
+        }
     }
 }

DiscordBot/appsettings.Development.json

@@ -20,7 +20,29 @@
       986279566563770408
     ],
     "ActivityScanningRate": "0.00:05:30",
-    "MaxBlogInactivityTime": "0.00:01:00"
+    "MaxBlogInactivityTime": "0.00:01:00",
+    "AdditionalPermissions": [
+      {
+        "TargetID": 447139136604733440,
+        "TargetType": "User",
+        "Permissions": {
+          "SendMessages": true,
+          "ViewChannel": true,
+          "ManageMessages": true,
+          "EmbedLinks": true,
+          "AddReactions": true,
+          "UseExternalEmojis": false
+        }
+      },
+      {
+        "TargetID": 983722959359315988,
+        "TargetType": "Role",
+        "Permissions": {
+          "SendMessages": true,
+          "UseExternalEmojis": false
+        }
+      }
+    ]
   },
   "Birthdays": {
     "AutoPostChannelID": 997905078121943130

DiscordBot/appsettings.Production.json

@@ -24,6 +24,20 @@
     "InactiveBlogsCategoryID": 788353984762347551,
     "IgnoredChannelsIDs": [
       526756609528168448
+    ],
+    "AdditionalPermissions": [
+      {
+        "TargetID": 437618149505105920,
+        "TargetType": "User",
+        "Permissions": {
+          "SendMessages": true,
+          "ViewChannel": true,
+          "ManageMessages": true,
+          "EmbedLinks": true,
+          "AddReactions": true,
+          "UseExternalEmojis": true
+        }
+      }
     ]
   },
   "Birthdays": {

DiscordBot/appsettings.json

@@ -30,7 +30,16 @@
       "whore",
       "bitch",
       "shit"
-    ]
+    ],
+    "EveryonePermissions": {
+      "SendMessages": false
+    },
+    "OwnerPermissions": {
+      "SendMessages": true,
+      "ManageMessages": true,
+      "ManageWebhooks": true,
+      "UseApplicationCommands": true
+    }
   },
   "Birthdays": {
     "AutoPostDaysAhead": 1