From fe16a58db72805a1144c099ac9f5a2fc832333af Mon Sep 17 00:00:00 2001
From: Cenk Ergen <57065323+Cenngo@users.noreply.github.com>
Date: Tue, 20 Dec 2022 15:38:49 +0300
Subject: [PATCH] Apply suggestions from code review
Co-authored-by: Quin Lynch <49576606+quinchs@users.noreply.github.com>
---
.../Guilds/WelcomeScreenChannelProperties.cs | 4 ++++
.../Entities/Invites/InviteGuild.cs | 21 +++++++++++++++----
.../API/Common/InviteGuild.cs | 1 -
.../Rest/ModifyGuildWelcomeScreenParams.cs | 1 -
.../Entities/Guilds/GuildHelper.cs | 1 -
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/Discord.Net.Core/Entities/Guilds/WelcomeScreenChannelProperties.cs b/src/Discord.Net.Core/Entities/Guilds/WelcomeScreenChannelProperties.cs
index dfab6fe91..c35470ef3 100644
--- a/src/Discord.Net.Core/Entities/Guilds/WelcomeScreenChannelProperties.cs
+++ b/src/Discord.Net.Core/Entities/Guilds/WelcomeScreenChannelProperties.cs
@@ -40,6 +40,10 @@ public class WelcomeScreenChannelProperties : ISnowflakeEntity
Emoji = emoji;
}
+ ///
+ /// Initializes a new instance of .
+ ///
+ public WelcomeScreenChannelProperties() { }
///
/// Initializes a new instance of .
///
diff --git a/src/Discord.Net.Core/Entities/Invites/InviteGuild.cs b/src/Discord.Net.Core/Entities/Invites/InviteGuild.cs
index a8559215c..b290716ec 100644
--- a/src/Discord.Net.Core/Entities/Invites/InviteGuild.cs
+++ b/src/Discord.Net.Core/Entities/Invites/InviteGuild.cs
@@ -80,8 +80,10 @@ public class InviteGuild : ISnowflakeEntity
///
/// A URL pointing to the guild's icon; if none is set.
///
- public string IconUrl => CDN.GetGuildIconUrl(Id, IconId);///
- ///
+ public string IconUrl => CDN.GetGuildIconUrl(Id, IconId);
+
+ ///
+ ///
/// Gets the level of requirements a user must fulfill before being allowed to post messages in this guild.
///
///
@@ -121,11 +123,22 @@ public class InviteGuild : ISnowflakeEntity
///
///
/// The welcome screen of this guild. if none is set.
- /// The welcome screen of this guild. if none is set.
///
public WelcomeScreen WelcomeScreen { get; private set; }
- internal InviteGuild(ulong id, string name, string description, string splashId, string bannerId, GuildFeatures features, string iconId, VerificationLevel verificationLevel, string vanityURLCode, int premiumSubscriptionCount, NsfwLevel nsfwLevel, WelcomeScreen welcomeScreen)
+ internal InviteGuild(
+ ulong id,
+ string name,
+ string description,
+ string splashId,
+ string bannerId,
+ GuildFeatures features,
+ string iconId,
+ VerificationLevel verificationLevel,
+ string vanityURLCode,
+ int premiumSubscriptionCount,
+ NsfwLevel nsfwLevel,
+ WelcomeScreen welcomeScreen)
{
Id = id;
Name = name;
diff --git a/src/Discord.Net.Rest/API/Common/InviteGuild.cs b/src/Discord.Net.Rest/API/Common/InviteGuild.cs
index 8d63de60d..82a17d68a 100644
--- a/src/Discord.Net.Rest/API/Common/InviteGuild.cs
+++ b/src/Discord.Net.Rest/API/Common/InviteGuild.cs
@@ -1,5 +1,4 @@
using Newtonsoft.Json;
-using System.Collections.Generic;
namespace Discord.API
{
diff --git a/src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs b/src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs
index b9a53c487..cf22bd927 100644
--- a/src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs
+++ b/src/Discord.Net.Rest/API/Rest/ModifyGuildWelcomeScreenParams.cs
@@ -2,7 +2,6 @@ using Newtonsoft.Json;
namespace Discord.API.Rest;
-[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
internal class ModifyGuildWelcomeScreenParams
{
[JsonProperty("enabled")]
diff --git a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
index f3deed351..a4df2d53d 100644
--- a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
+++ b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
@@ -2,7 +2,6 @@ using Discord.API.Rest;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
-using System.Data;
using System.Linq;
using System.Threading.Tasks;
using WidgetModel = Discord.API.GuildWidget;