Banned user additions

* Add params for ban notes, duration, and PM message
* Add UnBanUser
* Add BannedUsers listing to Subreddit
* Re-add missing parsing/init for Contributor

Author: absurdlyobfuscated

RedditSharp/RedditSharp.csproj

@@ -53,6 +53,7 @@
   <ItemGroup>
     <Compile Include="BotWebAgent.cs" />
     <Compile Include="Moderator Actions\ModActionType.cs" />
+    <Compile Include="Things\BannedUser.cs" />
     <Compile Include="Things\Contributor.cs" />
     <Compile Include="Things\ModAction.cs" />
     <Compile Include="Extensions\DateTimeExtensions\DateTimeExtensions.cs" />

RedditSharp/Things/BannedUser.cs

@@ -0,0 +1,34 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+
+namespace RedditSharp.Things
+{
+    public class BannedUser : Thing
+    {
+        [JsonProperty("date")]
+        [JsonConverter(typeof(UnixTimestampConverter))]
+        public DateTime? TimeStamp { get; set; }
+
+        [JsonProperty("note")]
+        public string Note { get; set; }
+
+        [JsonProperty("name")]
+        public string UserName { get; set; }
+
+        [JsonProperty("id")]
+        public string UserId { get; set; }
+
+        public BannedUser Init(Reddit reddit, JToken json, IWebAgent webAgent)
+        {
+            CommonInit(json);
+            JsonConvert.PopulateObject(json.ToString(), this, reddit.JsonSerializerSettings);
+            return this;
+        }
+
+        private void CommonInit(JToken json)
+        {
+            base.Init(json);
+        }
+    }
+}

RedditSharp/Things/Subreddit.cs

@@ -31,6 +31,7 @@ public class Subreddit : Thing
         private const string AcceptModeratorInviteUrl = "/api/accept_moderator_invite";
         private const string LeaveModerationUrl = "/api/unfriend";
         private const string BanUserUrl = "/api/friend";
+        private const string UnBanUserUrl = "/api/unfriend";
         private const string AddModeratorUrl = "/api/friend";
         private const string AddContributorUrl = "/api/friend";
         private const string ModeratorsUrl = "/r/{0}/about/moderators.json";
@@ -42,6 +43,7 @@ public class Subreddit : Thing
         private const string SearchUrlDate = "/r/{0}/search.json?q=timestamp:{1}..{2}&restrict_sr=on&sort={3}&syntax=cloudsearch";
         private const string ModLogUrl = "/r/{0}/about/log.json";
         private const string ContributorsUrl = "/r/{0}/about/contributors.json";
+        private const string BannedUsersUrl = "/r/{0}/about/banned.json";
 
         [JsonIgnore]
         private Reddit Reddit { get; set; }
@@ -346,6 +348,13 @@ public Listing<Contributor> Contributors
             }
         }
 
+        public Listing<BannedUser> BannedUsers
+        {
+            get
+            {
+                return new Listing<BannedUser>(Reddit, string.Format(BannedUsersUrl, Name), WebAgent);
+            }
+        }
 
         public async Task<Subreddit> InitAsync(Reddit reddit, JToken json, IWebAgent webAgent)
         {
@@ -741,6 +750,91 @@ public async Task BanUserAsync(string user, string reason)
             var response = await request.GetResponseAsync();
             var result = WebAgent.GetResponseString(response.GetResponseStream());
         }
+
+        /// <summary>
+        /// Bans a user
+        /// </summary>
+        /// <param name="user">User to ban, by username</param>
+        /// <param name="reason">Reason for ban, shows in ban note as 'reason: note' or just 'note' if blank</param>
+        /// <param name="note">Mod notes about ban, shows in ban note as 'reason: note'</param>
+        /// <param name="duration">Number of days to ban user, 0 for permanent</param>
+        /// <param name="message">Message to include in ban PM</param>
+        public void BanUser(string user, string reason, string note, int duration, string message)
+        {
+            var request = WebAgent.CreatePost(BanUserUrl);
+            WebAgent.WritePostBody(request.GetRequestStream(), new
+            {
+                api_type = "json",
+                uh = Reddit.User.Modhash,
+                r = Name,
+                container = FullName,
+                type = "banned",
+                name = user,
+                ban_reason = reason,
+                note = note,
+                duration = duration <= 0 ? "" : duration.ToString(),
+                ban_message = message
+            });
+            var response = request.GetResponse();
+            var result = WebAgent.GetResponseString(response.GetResponseStream());
+        }
+
+        public async Task BanUserAsync(string user, string reason, string note, int duration, string message)
+        {
+            var request = WebAgent.CreatePost(BanUserUrl);
+            WebAgent.WritePostBody(await request.GetRequestStreamAsync(), new
+            {
+                api_type = "json",
+                uh = Reddit.User.Modhash,
+                r = Name,
+                container = FullName,
+                type = "banned",
+                name = user,
+                ban_reason = reason,
+                note = note,
+                duration = duration <= 0 ? "" : duration.ToString(),
+                ban_message = message
+            });
+            var response = await request.GetResponseAsync();
+            var result = WebAgent.GetResponseString(response.GetResponseStream());
+        }
+
+        /// <summary>
+        /// Unbans a user
+        /// </summary>
+        /// <param name="user">User to unban, by username</param>
+        public void UnBanUser(string user)
+        {
+            var request = WebAgent.CreatePost(UnBanUserUrl);
+            WebAgent.WritePostBody(request.GetRequestStream(), new
+            {
+                uh = Reddit.User.Modhash,
+                r = Name,
+                type = "banned",
+                container = FullName,
+                executed = "removed",
+                name = user,
+            });
+            var response = request.GetResponse();
+            var result = WebAgent.GetResponseString(response.GetResponseStream());
+        }
+
+        public async Task UnBanUserAsync(string user)
+        {
+            var request = WebAgent.CreatePost(UnBanUserUrl);
+            WebAgent.WritePostBody(await request.GetRequestStreamAsync(), new
+            {
+                uh = Reddit.User.Modhash,
+                r = Name,
+                type = "banned",
+                container = FullName,
+                executed = "removed",
+                name = user,
+            });
+            var response = await request.GetResponseAsync();
+            var result = WebAgent.GetResponseString(response.GetResponseStream());
+        }
+
         private Post Submit(SubmitData data)
         {
             if (Reddit.User == null)

RedditSharp/Things/Thing.cs

@@ -122,6 +122,14 @@ public static async Task<Thing> ParseAsync<T>(Reddit reddit, JToken json, IWebAg
                 {
                     return await new ModAction().InitAsync(reddit, json, webAgent);
                 }
+                else if (typeof(T) == typeof(Contributor))
+                {
+                    return new Contributor().Init(reddit, json, webAgent);
+                }
+                else if (typeof(T) == typeof(BannedUser))
+                {
+                    return new BannedUser().Init(reddit, json, webAgent);
+                }
             }
             return result;
         }
@@ -138,6 +146,14 @@ public static Thing Parse<T>(Reddit reddit, JToken json, IWebAgent webAgent) whe
                 {
                     return new ModAction().Init(reddit, json, webAgent);
                 }
+                else if (typeof(T) == typeof(Contributor))
+                {
+                    return new Contributor().Init(reddit, json, webAgent);
+                }
+                else if (typeof(T) == typeof(BannedUser))
+                {
+                    return new BannedUser().Init(reddit, json, webAgent);
+                }
             }
             return result;
         }