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

Changed all == null to is null and all !(* == null) to * is not null

Browse Source
This commit is contained in:
Kwoth
2021-06-19 08:24:09 +02:00
parent 81406cb46a
commit d8c7cdc7f4
125 changed files with 367 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NadekoBot/Modules/Xp/Club.cs
View File

@@ -80,7 +80,7 @@ namespace NadekoBot.Modules.Xp
public async Task ClubIcon([Leftover] string url = null)
{
if ((!Uri.IsWellFormedUriString(url, UriKind.Absolute) && url != null)
|| !await _service.SetClubIcon(ctx.User.Id, url == null ? null : new Uri(url)))
|| !await _service.SetClubIcon(ctx.User.Id, url is null ? null : new Uri(url)))
{
await ReplyErrorLocalizedAsync("club_icon_error").ConfigureAwait(false);
return;
@@ -95,7 +95,7 @@ namespace NadekoBot.Modules.Xp
{
user = user ?? ctx.User;
var club = _service.GetClubByMember(user);
if (club == null)
if (club is null)
{
await ErrorLocalizedAsync("club_user_not_in_club", Format.Bold(user.ToString()));
return;
@@ -171,7 +171,7 @@ namespace NadekoBot.Modules.Xp
return Task.CompletedTask;
var club = _service.GetClubWithBansAndApplications(ctx.User.Id);
if (club == null)
if (club is null)
return ReplyErrorLocalizedAsync("club_not_exists_owner");
var bans = club
@@ -202,7 +202,7 @@ namespace NadekoBot.Modules.Xp
return Task.CompletedTask;
var club = _service.GetClubWithBansAndApplications(ctx.User.Id);
if (club == null)
if (club is null)
return ReplyErrorLocalizedAsync("club_not_exists_owner");
var apps = club

34
src/NadekoBot/Modules/Xp/Services/ClubService.cs
View File

@@ -32,7 +32,7 @@ namespace NadekoBot.Modules.Xp.Services
uow.SaveChanges();
var xp = new LevelStats(du.TotalXp);
if (xp.Level >= 5 && du.Club == null)
if (xp.Level >= 5 && du.Club is null)
{
du.IsClubAdmin = true;
du.Club = new ClubInfo()
@@ -65,7 +65,7 @@ namespace NadekoBot.Modules.Xp.Services
club = uow.Clubs.GetByOwner(from.Id);
var newOwnerUser = uow.GetOrCreateUser(newOwner);
if (club == null ||
if (club is null ||
club.Owner.UserId != from.Id ||
!club.Users.Contains(newOwnerUser))
return null;
@@ -86,7 +86,7 @@ namespace NadekoBot.Modules.Xp.Services
var club = uow.Clubs.GetByOwner(owner.Id);
var adminUser = uow.GetOrCreateUser(toAdmin);
if (club == null || club.Owner.UserId != owner.Id ||
if (club is null || club.Owner.UserId != owner.Id ||
!club.Users.Contains(adminUser))
throw new InvalidOperationException();
@@ -122,7 +122,7 @@ namespace NadekoBot.Modules.Xp.Services
{
var club = uow.Clubs.GetByOwner(ownerUserId);
if (club == null)
if (club is null)
return false;
club.ImageUrl = url.ToString();
@@ -148,7 +148,7 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
club = uow.Clubs.GetByName(name, discrim);
if (club == null)
if (club is null)
return false;
else
return true;
@@ -191,11 +191,11 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
var club = uow.Clubs.GetByOwnerOrAdmin(clubOwnerUserId);
if (club == null)
if (club is null)
return false;
var applicant = club.Applicants.FirstOrDefault(x => x.User.ToString().ToUpperInvariant() == userName.ToUpperInvariant());
if (applicant == null)
if (applicant is null)
return false;
applicant.User.Club = club;
@@ -227,7 +227,7 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
var du = uow.GetOrCreateUser(user);
if (du.Club == null || du.Club.OwnerId == du.Id)
if (du.Club is null || du.Club.OwnerId == du.Id)
return false;
du.Club = null;
@@ -245,7 +245,7 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
var club = uow.Clubs.GetByOwner(userId);
if (club == null)
if (club is null)
return false;
club.MinimumLevelReq = level;
@@ -260,7 +260,7 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
var club = uow.Clubs.GetByOwner(userId);
if (club == null)
if (club is null)
return false;
club.Description = desc?.TrimTo(150, true);
@@ -275,7 +275,7 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
club = uow.Clubs.GetByOwner(userId);
if (club == null)
if (club is null)
return false;
uow.Clubs.Remove(club);
@@ -289,12 +289,12 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
club = uow.Clubs.GetByOwnerOrAdmin(bannerId);
if (club == null)
if (club is null)
return false;
var usr = club.Users.FirstOrDefault(x => x.ToString().ToUpperInvariant() == userName.ToUpperInvariant())
?? club.Applicants.FirstOrDefault(x => x.User.ToString().ToUpperInvariant() == userName.ToUpperInvariant())?.User;
if (usr == null)
if (usr is null)
return false;
if (club.OwnerId == usr.Id || (usr.IsClubAdmin && club.Owner.UserId != bannerId)) // can't ban the owner kek, whew
@@ -322,11 +322,11 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
club = uow.Clubs.GetByOwnerOrAdmin(ownerUserId);
if (club == null)
if (club is null)
return false;
var ban = club.Bans.FirstOrDefault(x => x.User.ToString().ToUpperInvariant() == userName.ToUpperInvariant());
if (ban == null)
if (ban is null)
return false;
club.Bans.Remove(ban);
@@ -341,11 +341,11 @@ namespace NadekoBot.Modules.Xp.Services
using (var uow = _db.GetDbContext())
{
club = uow.Clubs.GetByOwnerOrAdmin(kickerId);
if (club == null)
if (club is null)
return false;
var usr = club.Users.FirstOrDefault(x => x.ToString().ToUpperInvariant() == userName.ToUpperInvariant());
if (usr == null)
if (usr is null)
return false;
if (club.OwnerId == usr.Id || (usr.IsClubAdmin && club.Owner.UserId != kickerId))

4
src/NadekoBot/Modules/Xp/Services/XpService.cs
View File

@@ -210,7 +210,7 @@ namespace NadekoBot.Modules.Xp.Services
if (rrew != null)
{
var role = first.User.Guild.GetRole(rrew.RoleId);
if (!(role is null))
if (role is not null)
{
if (rrew.Remove)
{
@@ -490,7 +490,7 @@ namespace NadekoBot.Modules.Xp.Services
{
ScanChannelForVoiceXp(after.VoiceChannel);
}
else if (after.VoiceChannel == null)
else if (after.VoiceChannel is null)
{
// In this case, the user left the channel and the previous for loops didn't catch
// it because it wasn't in any new channel. So we need to get rid of it.

2
src/NadekoBot/Modules/Xp/Xp.cs
View File

@@ -251,7 +251,7 @@ namespace NadekoBot.Modules.Xp
[RequireContext(ContextType.Guild)]
public async Task XpExclude(Channel _, [Leftover] IChannel channel = null)
{
if (channel == null)
if (channel is null)
channel = ctx.Channel;
var ex = _service.ToggleExcludeChannel(ctx.Guild.Id, channel.Id);