minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-12 02:08:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

- Updated editorconfig rules to hopefully look a bit nicer.

Browse Source 
- Removed configureawait(false) from everywhere as it doesnt' do anything in a console app and just makes the code look ugly
- Started using .WhenAll extension instead of Task.WhenAll to make it look nicer when chaining methods
This commit is contained in:
Kwoth
2021-12-28 21:14:26 +01:00
parent d093f7eed7
commit 723447c7d4
171 changed files with 1523 additions and 1594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/NadekoBot/Modules/Utility/Services/StreamRoleService.cs
View File

@@ -1,4 +1,4 @@
#nullable disable
#nullable disable
using NadekoBot.Services.Database.Models;
using NadekoBot.Common.TypeReaders;
using NadekoBot.Modules.Utility.Common;
@@ -29,7 +29,7 @@ public class StreamRoleService : INService
{
try
{
await Task.WhenAll(client.Guilds.Select(g => RescanUsers(g))).ConfigureAwait(false);
await client.Guilds.Select(g => RescanUsers(g)).WhenAll();
}
catch
{
@@ -45,7 +45,7 @@ public class StreamRoleService : INService
//if user wasn't streaming or didn't have a game status at all
if (guildSettings.TryGetValue(after.Guild.Id, out var setting))
{
await RescanUser(after, setting).ConfigureAwait(false);
await RescanUser(after, setting);
}
});
@@ -114,7 +114,7 @@ public class StreamRoleService : INService
}
if (success)
{
await RescanUsers(guild).ConfigureAwait(false);
await RescanUsers(guild);
}
return success;
}
@@ -138,7 +138,7 @@ public class StreamRoleService : INService
uow.SaveChanges();
}
await RescanUsers(guild).ConfigureAwait(false);
await RescanUsers(guild);
return keyword;
}
@@ -189,10 +189,10 @@ public class StreamRoleService : INService
UpdateCache(fromRole.Guild.Id, setting);
foreach (var usr in await fromRole.GetMembersAsync().ConfigureAwait(false))
foreach (var usr in await fromRole.GetMembersAsync())
{
if (usr is { } x)
await RescanUser(x, setting, addRole).ConfigureAwait(false);
await RescanUser(x, setting, addRole);
}
}
@@ -212,7 +212,7 @@ public class StreamRoleService : INService
}
if (guildSettings.TryRemove(guild.Id, out var setting) && cleanup)
await RescanUsers(guild).ConfigureAwait(false);
await RescanUsers(guild);
}
private async Task RescanUser(IGuildUser user, StreamRoleSettings setting, IRole addRole = null)
@@ -236,7 +236,7 @@ public class StreamRoleService : INService
addRole ??= user.Guild.GetRole(setting.AddRoleId);
if (addRole is null)
{
await StopStreamRole(user.Guild).ConfigureAwait(false);
await StopStreamRole(user.Guild);
Log.Warning("Stream role in server {0} no longer exists. Stopping.", setting.AddRoleId);
return;
}
@@ -244,14 +244,14 @@ public class StreamRoleService : INService
//check if he doesn't have addrole already, to avoid errors
if (!user.RoleIds.Contains(addRole.Id))
{
await user.AddRoleAsync(addRole).ConfigureAwait(false);
await user.AddRoleAsync(addRole);
Log.Information("Added stream role to user {0} in {1} server", user.ToString(),
user.Guild.ToString());
}
}
catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.Forbidden)
{
await StopStreamRole(user.Guild).ConfigureAwait(false);
await StopStreamRole(user.Guild);
Log.Warning(ex, "Error adding stream role(s). Forcibly disabling stream role feature");
throw new StreamRolePermissionException();
}
@@ -271,12 +271,12 @@ public class StreamRoleService : INService
if (addRole is null)
throw new StreamRoleNotFoundException();
await user.RemoveRoleAsync(addRole).ConfigureAwait(false);
await user.RemoveRoleAsync(addRole);
Log.Information("Removed stream role from the user {0} in {1} server", user.ToString(), user.Guild.ToString());
}
catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.Forbidden)
{
await StopStreamRole(user.Guild).ConfigureAwait(false);
await StopStreamRole(user.Guild);
Log.Warning(ex, "Error removing stream role(s). Forcibly disabling stream role feature");
throw new StreamRolePermissionException();
}
@@ -295,11 +295,11 @@ public class StreamRoleService : INService
if (setting.Enabled)
{
var users = await guild.GetUsersAsync(CacheMode.CacheOnly).ConfigureAwait(false);
var users = await guild.GetUsersAsync(CacheMode.CacheOnly);
foreach (var usr in users.Where(x => x.RoleIds.Contains(setting.FromRoleId) || x.RoleIds.Contains(addRole.Id)))
{
if (usr is { } x)
await RescanUser(x, setting, addRole).ConfigureAwait(false);
await RescanUser(x, setting, addRole);
}
}
}