Skip to content

Commit 8b20b0c

Browse files
committed
Minor adjustments to sorting
1 parent ed80f7a commit 8b20b0c

File tree

7 files changed

+23
-7
lines changed

7 files changed

+23
-7
lines changed

src/Skybrud.Social.TwentyThree/Options/Albums/TwentyThreeAlbumSortField.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
public enum TwentyThreeAlbumSortField {
44

5+
Unspecified,
6+
57
CreationDate,
68

79
SortKey,

src/Skybrud.Social.TwentyThree/Options/Embed/TwentyThreePhotoEmbedOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ public class TwentyThreePhotoEmbedOptions {
1515
public TwentyThreePhotoEmbedOnEnd OnEnd { get; set;}
1616

1717
}
18+
1819
}

src/Skybrud.Social.TwentyThree/Options/Photos/TwentyThreeGetPhotosOptions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public class TwentyThreeGetPhotosOptions : IHttpRequestOptions {
5353
/// <summary>
5454
/// Gets or sets the field by which the albums should be sorted.
5555
/// </summary>
56-
public TwentyThreePhotoSortField? OrderBy { get; set; }
56+
public TwentyThreePhotoSortField OrderBy { get; set; }
5757

5858
/// <summary>
5959
/// Gets or sets the order by which the albums should be sorted.
6060
/// </summary>
61-
public TwentyThreeSortOrder? Order { get; set; }
61+
public TwentyThreeSortOrder Order { get; set; }
6262

6363
/// <summary>
6464
/// Gets or sets the page offset of the request.
@@ -92,8 +92,8 @@ public IHttpRequest GetRequest() {
9292
break;
9393
}
9494

95-
if (OrderBy != null) query.Add("orderby", TwentyThreeUtils.ToString(OrderBy));
96-
if (Order != null) query.Add("order", TwentyThreeUtils.ToString(Order));
95+
if (OrderBy != default) query.Add("orderby", TwentyThreeUtils.ToString(OrderBy));
96+
if (Order != default) query.Add("order", TwentyThreeUtils.ToString(Order));
9797

9898
if (Page > 0) query.Add("p", Page);
9999
if (Size > 0) query.Add("size", Size);

src/Skybrud.Social.TwentyThree/Options/Photos/TwentyThreePhotoSortField.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
namespace Skybrud.Social.TwentyThree.Options.Photos {
22

33
public enum TwentyThreePhotoSortField {
4+
5+
Unspecified,
6+
47
Views,
58
Comments,
69
Taken,
@@ -10,6 +13,7 @@ public enum TwentyThreePhotoSortField {
1013
Created,
1114
Uploaded,
1215
Published
16+
1317
}
1418

1519
}

src/Skybrud.Social.TwentyThree/Options/Spots/TwentyThreeGetSpotsOptions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class TwentyThreeGetSpotsOptions : IHttpRequestOptions {
2424

2525
public TwentyThreeSpotSortField OrderBy { get; set; }
2626

27-
public SortOrder Order { get; set; }
27+
public TwentyThreeSortOrder Order { get; set; }
2828

2929
public int Page { get; set; }
3030

@@ -60,8 +60,8 @@ public IHttpRequest GetRequest() {
6060
break;
6161
}
6262

63-
if (OrderBy != default) query.Add("orderby", OrderBy.ToUnderscore());
64-
if (Order != default) query.Add("order", Order == SortOrder.Ascending ? "asc" : "desc");
63+
if (OrderBy != default) query.Add("orderby", TwentyThreeUtils.ToString(OrderBy));
64+
if (Order != default) query.Add("order", TwentyThreeUtils.ToString(Order));
6565

6666
if (Page > 0) query.Add("p", Page);
6767
if (Size > 0) query.Add("size", Size);
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
namespace Skybrud.Social.TwentyThree.Options.Spots {
22

33
public enum TwentyThreeSpotSortField {
4+
5+
Unspecified,
6+
47
Name,
58
Title,
69
CreationTime
10+
711
}
812

913
}

src/Skybrud.Social.TwentyThree/TwentyThreeUtils.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Skybrud.Social.TwentyThree.Options.Albums;
77
using Skybrud.Social.TwentyThree.Options.Embed;
88
using Skybrud.Social.TwentyThree.Options.Photos;
9+
using Skybrud.Social.TwentyThree.Options.Spots;
910

1011
namespace Skybrud.Social.TwentyThree {
1112

@@ -25,6 +26,10 @@ public static string ToString(TwentyThreeAlbumSortField field) {
2526
_ => field.ToUnderscore()
2627
};
2728
}
29+
30+
public static object ToString(TwentyThreeSpotSortField field) {
31+
return field.ToUnderscore();
32+
}
2833

2934
public static object ToString(TwentyThreeSortOrder? order) {
3035
return order switch {

0 commit comments

Comments
 (0)