diff --git a/DisCatSharp/Entities/Thread/DiscordThreadResult.cs b/DisCatSharp/Entities/Thread/DiscordThreadResult.cs index 978c8425a..26e42e810 100644 --- a/DisCatSharp/Entities/Thread/DiscordThreadResult.cs +++ b/DisCatSharp/Entities/Thread/DiscordThreadResult.cs @@ -1,53 +1,61 @@ // This file is part of the DisCatSharp project, based off DSharpPlus. // // Copyright (c) 2021-2022 AITSYS // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal // in the Software without restriction, including without limitation the rights // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: // // The above copyright notice and this permission notice shall be included in all // copies or substantial portions of the Software. // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. using System.Collections.Generic; +using System.Linq; + +using Newtonsoft.Json; namespace DisCatSharp.Entities; /// /// Represents a discord thread result. /// public class DiscordThreadResult { /// /// Gets the returned threads. /// - public Dictionary ReturnedThreads { get; internal set; } + [JsonIgnore] + public Dictionary ReturnedThreads + => this.Threads == null || !this.Threads.Any() ? new Dictionary() : this.Threads.Select(t => new { t.Id, t }).ToDictionary(t => t.Id, t => t.t); + [JsonProperty("threads", NullValueHandling = NullValueHandling.Ignore)] + internal List Threads { get; set; } /// /// Gets the active members. /// + [JsonProperty("members", NullValueHandling = NullValueHandling.Ignore)] public List ActiveMembers { get; internal set; } /// /// Whether there are more results. /// public bool HasMore { get; internal set; } /// /// Initializes a new instance of the class. /// internal DiscordThreadResult() : base() { } }