github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

whoops (#3047)

Browse Source
This commit is contained in:
Mihail Gribkov
2025-01-08 01:02:38 +03:00
committed by GitHub
parent 36439b6325
commit 2759dbacdb
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Discord.Net.Core/Entities/Guilds/MemberSearchPropertiesV2.cs
View File

@@ -13,12 +13,12 @@ public class MemberSearchPropertiesV2
/// <summary> /// <summary>
/// Gets or sets the after property for the search. /// Gets or sets the after property for the search.
/// </summary> /// </summary>
public MemberSearchPaginationFilter After { get; set; } public MemberSearchPaginationFilter? After { get; set; }
/// <summary> /// <summary>
/// Gets or sets the before property for the search. /// Gets or sets the before property for the search.
/// </summary> /// </summary>
public MemberSearchPaginationFilter Before { get; set; } public MemberSearchPaginationFilter? Before { get; set; }
/// <summary> /// <summary>
/// Gets or sets the sort type for the search. /// Gets or sets the sort type for the search.
@@ -230,10 +230,10 @@ public struct MemberSearchIntQuery : IMemberSearchQuery
public IEnumerable<int> OrQuery { get; set; } public IEnumerable<int> OrQuery { get; set; }
/// <inheritdoc /> /// <inheritdoc />
IEnumerable<object> IMemberSearchQuery.AndQuery => AndQuery.Select(x => (object)x); IEnumerable<object> IMemberSearchQuery.AndQuery => AndQuery?.Select(x => (object)x);
/// <inheritdoc /> /// <inheritdoc />
IEnumerable<object> IMemberSearchQuery.OrQuery => OrQuery.Select(x => (object)x); IEnumerable<object> IMemberSearchQuery.OrQuery => OrQuery?.Select(x => (object)x);
} }
@@ -249,8 +249,8 @@ public struct MemberSearchSnowflakeQuery : IMemberSearchQuery
public IEnumerable<ulong> OrQuery { get; set; } public IEnumerable<ulong> OrQuery { get; set; }
/// <inheritdoc /> /// <inheritdoc />
IEnumerable<object> IMemberSearchQuery.AndQuery => AndQuery.Select(x => (object)x); IEnumerable<object> IMemberSearchQuery.AndQuery => AndQuery?.Select(x => (object)x);
/// <inheritdoc /> /// <inheritdoc />
IEnumerable<object> IMemberSearchQuery.OrQuery => OrQuery.Select(x => (object)x); IEnumerable<object> IMemberSearchQuery.OrQuery => OrQuery?.Select(x => (object)x);
} }

9
src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
View File

@@ -777,13 +777,8 @@ namespace Discord.Rest
var apiArgs = new SearchGuildMembersParamsV2 var apiArgs = new SearchGuildMembersParamsV2
{ {
Limit = limit, Limit = limit,
After = args is null After = args?.After?.ToModel() ?? Optional<API.Rest.MemberSearchPaginationFilter>.Unspecified,
? null Before = args?.Before?.ToModel() ?? Optional<API.Rest.MemberSearchPaginationFilter>.Unspecified,
: new API.Rest.MemberSearchPaginationFilter
{
UserId = args.After.UserId,
GuildJoinedAt = args.After.GuildJoinedAt
},
Sort = args?.Sort ?? Optional<MemberSearchV2SortType>.Unspecified, Sort = args?.Sort ?? Optional<MemberSearchV2SortType>.Unspecified,
OrQuery = args?.OrQuery?.ToModel() ?? Optional<API.Rest.MemberSearchFilter>.Unspecified, OrQuery = args?.OrQuery?.ToModel() ?? Optional<API.Rest.MemberSearchFilter>.Unspecified,
AndQuery = args?.AndQuery?.ToModel() ?? Optional<API.Rest.MemberSearchFilter>.Unspecified AndQuery = args?.AndQuery?.ToModel() ?? Optional<API.Rest.MemberSearchFilter>.Unspecified

22
src/Discord.Net.Rest/Extensions/MemberSearchExtensions.cs
View File

@@ -7,13 +7,7 @@ internal static class MemberSearchExtensions
internal static API.Rest.SearchQueryProperties ToModel(this IMemberSearchQuery props) internal static API.Rest.SearchQueryProperties ToModel(this IMemberSearchQuery props)
=> new () => new ()
{ {
Range = props.Range.HasValue Range = props.Range?.ToModel() ?? Optional<API.Rest.SearchRangeProperties>.Unspecified,
? new API.Rest.SearchRangeProperties
{
GreaterThanOrEqual = props.Range.Value.GreaterThanOrEqual.HasValue ? props.Range.Value.GreaterThanOrEqual.Value : Optional<long>.Unspecified,
LessThanOrEqual = props.Range.Value.LessThanOrEqual.HasValue ? props.Range.Value.LessThanOrEqual.Value : Optional<long>.Unspecified
}
: Optional<API.Rest.SearchRangeProperties>.Unspecified,
AndQuery = props.AndQuery is not null ? new Optional<IEnumerable<object>>(props.AndQuery) : Optional<IEnumerable<object>>.Unspecified, AndQuery = props.AndQuery is not null ? new Optional<IEnumerable<object>>(props.AndQuery) : Optional<IEnumerable<object>>.Unspecified,
OrQuery = props.OrQuery is not null ? new Optional<IEnumerable<object>>(props.OrQuery) : Optional<IEnumerable<object>>.Unspecified OrQuery = props.OrQuery is not null ? new Optional<IEnumerable<object>>(props.OrQuery) : Optional<IEnumerable<object>>.Unspecified
}; };
@@ -40,4 +34,18 @@ internal static class MemberSearchExtensions
UserId = props.UserId?.ToModel() ?? Optional<API.Rest.SearchQueryProperties>.Unspecified, UserId = props.UserId?.ToModel() ?? Optional<API.Rest.SearchQueryProperties>.Unspecified,
Usernames = props.Usernames?.ToModel() ?? Optional<API.Rest.SearchQueryProperties>.Unspecified Usernames = props.Usernames?.ToModel() ?? Optional<API.Rest.SearchQueryProperties>.Unspecified
}; };
internal static API.Rest.SearchRangeProperties ToModel(this MemberSearchV2Range props)
=> new()
{
GreaterThanOrEqual = props.GreaterThanOrEqual ?? Optional<long>.Unspecified,
LessThanOrEqual = props.LessThanOrEqual ?? Optional<long>.Unspecified
};
internal static API.Rest.MemberSearchPaginationFilter ToModel(this MemberSearchPaginationFilter props)
=> new()
{
UserId = props.UserId,
GuildJoinedAt = props.GuildJoinedAt,
};
} }