Merge pull request #34 from pimanac/listing-fixes

yield new replies to modmails in a ListingStream

Author: CrustyJew

RedditSharp/Listing.cs

@@ -255,12 +255,12 @@ private void PageForward()
                 {
                     int limit = LimitPerRequest;
 
-                    if (limit > MaximumLimit)
+                    if (limit > MaximumLimit && MaximumLimit != -1)
                     {
                         // If the limit is more than the maximum number of listings, adjust
                         limit = MaximumLimit;
                     }
-                    else if (Count + limit > MaximumLimit)
+                    else if (Count + limit > MaximumLimit && MaximumLimit != -1)
                     {
                         // If a smaller subset of listings are needed, adjust the limit
                         limit = MaximumLimit - Count;
@@ -289,7 +289,6 @@ private void PageForward()
                 Parse(json);
             }
 
-
             private void Parse(JToken json)
             {
                 var children = json["data"]["children"] as JArray;
@@ -301,8 +300,24 @@ private void Parse(JToken json)
                         things.Add(Thing.Parse<T>(Listing.Reddit, children[i], Listing.WebAgent));
                     else
                     {
-                        // we only want to see new items.
+                        var kind = children[i]["kind"].ValueOrDefault<string>();
                         var id = children[i]["data"]["id"].ValueOrDefault<string>();
+
+                        // check for new replies to pm / modmail
+                        if (kind == "t4" && children[i]["data"]["replies"].HasValues)
+                        {
+                            var replies = children[i]["data"]["replies"]["data"]["children"] as JArray;
+                            foreach (var reply in replies)
+                            {
+                                var replyId = reply["data"]["id"].ValueOrDefault<string>();
+                                if (done.Contains(replyId))
+                                    continue;
+
+                                things.Add(Thing.Parse<T>(Listing.Reddit, reply, Listing.WebAgent));
+                                done.Add(replyId);
+                            }
+                        }
+
                         if (String.IsNullOrEmpty(id) || done.Contains(id))
                             continue;
 
@@ -311,6 +326,7 @@ private void Parse(JToken json)
                     }
                 }
 
+                // this doesn't really work when we're processing messages with replies.
                 if (stream)
                     things.Reverse();
 
@@ -390,8 +406,6 @@ private bool MoveNextForward()
                         catch (Exception ex)
                         {
                             // sleep for a while to see if we can recover
-                            // Sleep() will rethrow after waiting a bit
-                            // todo: make this smarter
                             Sleep(tries,ex);
                         }
 

RedditSharp/Things/Subreddit.cs

@@ -43,6 +43,7 @@ public class Subreddit : Thing
         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";
+        private const string ModmailUrl = "/r/{0}/message/moderator/inbox.json";
 
         [JsonIgnore]
         private Reddit Reddit { get; set; }
@@ -349,6 +350,21 @@ public Listing<BannedUser> BannedUsers
             }
         }
 
+        /// <summary>
+        /// Subreddit modmail.
+        /// <para/>
+        ///  When calling <see cref="System.Linq.Enumerable.Take{T}"/> make sure to take replies into account!
+        /// </summary>
+        public Listing<PrivateMessage> Modmail
+        {
+            get
+            {
+                if (Reddit.User == null)
+                    throw new AuthenticationException("No user logged in.");
+                return new Listing<PrivateMessage>(Reddit, string.Format(ModmailUrl, Name), WebAgent);
+            }
+        }
+
         public async Task<Subreddit> InitAsync(Reddit reddit, JToken json, IWebAgent webAgent)
         {
             CommonInit(reddit, json, webAgent);