From 4bc37d8c33571b6d2af041e81f2b5c05874fccbb Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Thu, 12 May 2016 10:57:29 -0300
Subject: [PATCH] Added IGuild.IsOwner, cleaned a few exceptions

---
 src/Discord.Net/Common/Entities/Guilds/IGuild.cs  | 2 ++
 src/Discord.Net/Rest/Entities/Guilds/Guild.cs     | 6 ++++++
 src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Discord.Net/Common/Entities/Guilds/IGuild.cs b/src/Discord.Net/Common/Entities/Guilds/IGuild.cs
index 2c3d8a3c8..16db2c0e3 100644
--- a/src/Discord.Net/Common/Entities/Guilds/IGuild.cs
+++ b/src/Discord.Net/Common/Entities/Guilds/IGuild.cs
@@ -11,6 +11,8 @@ namespace Discord
         int AFKTimeout { get; }
         /// <summary> Returns true if this guild is embeddable (e.g. widget) </summary>
         bool IsEmbeddable { get; }
+        /// <summary> Returns true if the current user owns this guild. </summary>
+        bool IsOwner { get; }
         /// <summary> Gets the name of this guild. </summary>
         string Name { get; }
         int VerificationLevel { get; }
diff --git a/src/Discord.Net/Rest/Entities/Guilds/Guild.cs b/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
index 481a8d884..60170d0fa 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/Guild.cs
@@ -46,6 +46,8 @@ namespace Discord.Rest
         /// <inheritdoc />
         public DateTime CreatedAt => DateTimeHelper.FromSnowflake(Id);
         /// <inheritdoc />
+        public bool IsOwner => OwnerId == Discord.CurrentUser.Id;
+        /// <inheritdoc />
         public string IconUrl => API.CDN.GetGuildIconUrl(Id, _iconId);
         /// <inheritdoc />
         public string SplashUrl => API.CDN.GetGuildSplashUrl(Id, _splashId);
@@ -155,11 +157,15 @@ namespace Discord.Rest
         /// <inheritdoc />
         public async Task Leave()
         {
+            if (IsOwner)
+                throw new InvalidOperationException("Unable to leave a guild the current user owns.");
             await Discord.BaseClient.LeaveGuild(Id).ConfigureAwait(false);
         }
         /// <inheritdoc />
         public async Task Delete()
         {
+            if (!IsOwner)
+                throw new InvalidOperationException("Unable to delete a guild the current user does not own.");
             await Discord.BaseClient.DeleteGuild(Id).ConfigureAwait(false);
         }
 
diff --git a/src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs b/src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs
index d278b6341..cae71f5ae 100644
--- a/src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs
+++ b/src/Discord.Net/Rest/Entities/Guilds/UserGuild.cs
@@ -41,14 +41,14 @@ namespace Discord.Rest
         public async Task Leave()
         {
             if (IsOwner)
-                throw new InvalidOperationException("Unable to leave a guild the current user owns, use Delete() instead.");
+                throw new InvalidOperationException("Unable to leave a guild the current user owns.");
             await Discord.BaseClient.LeaveGuild(Id).ConfigureAwait(false);
         }
         /// <inheritdoc />
         public async Task Delete()
         {
             if (!IsOwner)
-                throw new InvalidOperationException("Unable to leave a guild the current user owns, use Delete() instead.");
+                throw new InvalidOperationException("Unable to delete a guild the current user does not own.");
             await Discord.BaseClient.DeleteGuild(Id).ConfigureAwait(false);
         }