diff --git a/DiscordBot/App.config b/DiscordBot/App.config index b34bd13..e97fa71 100644 --- a/DiscordBot/App.config +++ b/DiscordBot/App.config @@ -9,7 +9,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -53,7 +53,15 @@ - + + + + + + + + + diff --git a/DiscordBot/DiscordBot.csproj b/DiscordBot/DiscordBot.csproj index f973fb6..be10303 100644 --- a/DiscordBot/DiscordBot.csproj +++ b/DiscordBot/DiscordBot.csproj @@ -124,41 +124,44 @@ Properties\app.manifest - - packages\Discord.Net.Commands.2.2.0\lib\net461\Discord.Net.Commands.dll + + packages\Discord.Net.Commands.3.1.0\lib\net461\Discord.Net.Commands.dll - - packages\Discord.Net.Core.2.2.0\lib\net461\Discord.Net.Core.dll + + packages\Discord.Net.Core.3.1.0\lib\net461\Discord.Net.Core.dll - - packages\Discord.Net.Rest.2.2.0\lib\net461\Discord.Net.Rest.dll + + packages\Discord.Net.Interactions.3.1.0\lib\net461\Discord.Net.Interactions.dll + + + packages\Discord.Net.Rest.3.1.0\lib\net461\Discord.Net.Rest.dll packages\Discord.Net.Rpc.1.0.2\lib\net45\Discord.Net.Rpc.dll - - packages\Discord.Net.Webhook.2.2.0\lib\netstandard2.0\Discord.Net.Webhook.dll + + packages\Discord.Net.Webhook.3.1.0\lib\netstandard2.0\Discord.Net.Webhook.dll - - packages\Discord.Net.WebSocket.2.2.0\lib\net461\Discord.Net.WebSocket.dll + + packages\Discord.Net.WebSocket.3.1.0\lib\net461\Discord.Net.WebSocket.dll - - packages\Google.Apis.1.49.0\lib\net45\Google.Apis.dll + + packages\Google.Apis.1.55.0\lib\net45\Google.Apis.dll - - packages\Google.Apis.Auth.1.49.0\lib\net45\Google.Apis.Auth.dll + + packages\Google.Apis.Auth.1.55.0\lib\net461\Google.Apis.Auth.dll - - packages\Google.Apis.Auth.1.49.0\lib\net45\Google.Apis.Auth.PlatformServices.dll + + packages\Google.Apis.Auth.1.55.0\lib\net461\Google.Apis.Auth.PlatformServices.dll - - packages\Google.Apis.Core.1.49.0\lib\net45\Google.Apis.Core.dll + + packages\Google.Apis.Core.1.55.0\lib\net45\Google.Apis.Core.dll - - packages\Google.Apis.1.49.0\lib\net45\Google.Apis.PlatformServices.dll + + packages\Google.Apis.1.55.0\lib\net45\Google.Apis.PlatformServices.dll - - packages\Google.Apis.Sheets.v4.1.35.2.1358\lib\net45\Google.Apis.Sheets.v4.dll + + packages\Google.Apis.Sheets.v4.1.55.0.2371\lib\net45\Google.Apis.Sheets.v4.dll packages\Google.GData.Client.2.2.0.0\lib\Google.GData.Client.dll @@ -169,21 +172,21 @@ packages\Google.GData.Spreadsheets.2.2.0.0\lib\Google.GData.Spreadsheets.dll - - packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - packages\Microsoft.Extensions.DependencyInjection.3.1.9\lib\net461\Microsoft.Extensions.DependencyInjection.dll + + packages\Microsoft.Extensions.DependencyInjection.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.9\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll True - - packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -193,8 +196,8 @@ 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.Immutable.6.0.0\lib\net461\System.Collections.Immutable.dll @@ -202,8 +205,8 @@ True - - packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll @@ -213,8 +216,8 @@ packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll True - - packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll + + packages\System.Interactive.Async.5.1.0\lib\net461\System.Interactive.Async.dll packages\System.IO.4.3.0\lib\net462\System.IO.dll @@ -240,8 +243,8 @@ packages\System.Linq.4.3.0\lib\net463\System.Linq.dll True - - packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll + + packages\System.Linq.Async.5.1.0\lib\net461\System.Linq.Async.dll packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll @@ -250,8 +253,8 @@ packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll + + packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll @@ -261,6 +264,9 @@ packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll + packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll True @@ -270,11 +276,12 @@ True True - - packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll + + packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll + True True @@ -310,6 +317,9 @@ packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + diff --git a/DiscordBot/Program.cs b/DiscordBot/Program.cs index 581e920..e30f603 100644 --- a/DiscordBot/Program.cs +++ b/DiscordBot/Program.cs @@ -16,7 +16,7 @@ internal class Program private DiscordSocketClient _client; private CommandHandler _handler; - private const string Version = "0.3.4"; + private const string Version = "0.3.5"; private static void Main(string[] args) => new Program().StartAsync(args).GetAwaiter().GetResult(); @@ -43,7 +43,8 @@ public async Task StartAsync(string[] args) _client = new DiscordSocketClient(new DiscordSocketConfig { - LogLevel = logS + LogLevel = logS, + GatewayIntents = GatewayIntents.GuildMembers | GatewayIntents.Guilds }); _client.Log += Log; diff --git a/DiscordBot/SheetsFunctionality.cs b/DiscordBot/SheetsFunctionality.cs index cde2bce..05593d8 100644 --- a/DiscordBot/SheetsFunctionality.cs +++ b/DiscordBot/SheetsFunctionality.cs @@ -171,6 +171,7 @@ public static async Task AddRolesToUser(SocketGuildUser user, SocketRole[] roles } } if (updatedRoles.Count == 0) return; + await user.AddRolesAsync(updatedRoles); } diff --git a/DiscordBot/packages.config b/DiscordBot/packages.config index 160aa4a..acff9c4 100644 --- a/DiscordBot/packages.config +++ b/DiscordBot/packages.config @@ -1,64 +1,67 @@  - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - + - + - + - + - + - + + - - + + + @@ -71,6 +74,7 @@ + \ No newline at end of file