Incorporate the latest API changes

Author: rubengees

library/src/main/java/me/proxer/library/api/notifications/InternalApi.java

@@ -4,6 +4,7 @@
 import me.proxer.library.entitiy.notifications.NewsArticle;
 import me.proxer.library.entitiy.notifications.Notification;
 import me.proxer.library.entitiy.notifications.NotificationInfo;
+import me.proxer.library.enums.NotificationFilter;
 import retrofit2.http.*;
 
 import java.util.List;
@@ -14,11 +15,13 @@
 interface InternalApi {
 
     @GET("notifications/news")
-    ProxerCall<List<NewsArticle>> news(@Query("p") Integer page, @Query("limit") Integer limit);
+    ProxerCall<List<NewsArticle>> news(@Query("p") Integer page, @Query("limit") Integer limit,
+                                       @Query("set_read") Boolean markAsRead);
 
     @GET("notifications/notifications")
     ProxerCall<List<Notification>> notifications(@Query("p") Integer page, @Query("limit") Integer limit,
-                                                 @Query("set_read") Boolean markAsRead);
+                                                 @Query("set_read") Boolean markAsRead,
+                                                 @Query("filter") NotificationFilter filter);
 
     @GET("notifications/count")
     ProxerCall<NotificationInfo> notificationInfo();

library/src/main/java/me/proxer/library/api/notifications/NewsEndpoint.java

@@ -34,6 +34,13 @@ public final class NewsEndpoint implements PagingLimitEndpoint<List<NewsArticle>
     @Setter(onMethod = @__({@Override, @Nonnull}))
     private Integer limit;
 
+    /**
+     * Sets if the news should be marked as read. Defaults to false.
+     */
+    @Nullable
+    @Setter(onMethod = @__({@Nonnull}))
+    private Boolean markAsRead;
+
     NewsEndpoint(@Nonnull final InternalApi internalApi) {
         this.internalApi = internalApi;
     }
@@ -44,6 +51,6 @@ public final class NewsEndpoint implements PagingLimitEndpoint<List<NewsArticle>
     @Override
     @Nonnull
     public ProxerCall<List<NewsArticle>> build() {
-        return internalApi.news(page, limit);
+        return internalApi.news(page, limit, markAsRead);
     }
 }

library/src/main/java/me/proxer/library/api/notifications/NotificationsEndpoint.java

@@ -5,6 +5,7 @@
 import me.proxer.library.api.PagingLimitEndpoint;
 import me.proxer.library.api.ProxerCall;
 import me.proxer.library.entitiy.notifications.Notification;
+import me.proxer.library.enums.NotificationFilter;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -41,6 +42,13 @@ public final class NotificationsEndpoint implements PagingLimitEndpoint<List<Not
     @Setter(onMethod = @__({@Nonnull}))
     private Boolean markAsRead;
 
+    /**
+     * {@inheritDoc}
+     */
+    @Nullable
+    @Setter(onMethod = @__({@Nonnull}))
+    private NotificationFilter filter;
+
     NotificationsEndpoint(@Nonnull final InternalApi internalApi) {
         this.internalApi = internalApi;
     }
@@ -51,6 +59,6 @@ public final class NotificationsEndpoint implements PagingLimitEndpoint<List<Not
     @Override
     @Nonnull
     public ProxerCall<List<Notification>> build() {
-        return internalApi.notifications(page, limit, markAsRead);
+        return internalApi.notifications(page, limit, markAsRead, filter);
     }
 }

library/src/main/java/me/proxer/library/enums/NotificationFilter.java

@@ -0,0 +1,9 @@
+package me.proxer.library.enums;
+
+import com.squareup.moshi.Json;
+
+public enum NotificationFilter {
+    @Json(name = "0") ALL,
+    @Json(name = "1") UNREAD,
+    @Json(name = "2") READ
+}

library/src/test/java/me/proxer/library/api/notifications/NewsEndpointTest.java

@@ -36,10 +36,11 @@ public void testPath() throws ProxerException, IOException, InterruptedException
         api.notifications().news()
                 .page(0)
                 .limit(10)
+                .markAsRead(false)
                 .build()
                 .execute();
 
-        assertThat(server.takeRequest().getPath()).isEqualTo("/api/v1/notifications/news?p=0&limit=10");
+        assertThat(server.takeRequest().getPath()).isEqualTo("/api/v1/notifications/news?p=0&limit=10&set_read=false");
     }
 
     private NewsArticle buildTestArticle() {

library/src/test/java/me/proxer/library/api/notifications/NotificationEndpointTest.java

@@ -3,6 +3,7 @@
 import me.proxer.library.ProxerTest;
 import me.proxer.library.api.ProxerException;
 import me.proxer.library.entitiy.notifications.Notification;
+import me.proxer.library.enums.NotificationFilter;
 import me.proxer.library.enums.NotificationType;
 import okhttp3.HttpUrl;
 import okhttp3.mockwebserver.MockResponse;
@@ -39,11 +40,12 @@ public void testPath() throws ProxerException, IOException, InterruptedException
                 .page(0)
                 .limit(10)
                 .markAsRead(true)
+                .filter(NotificationFilter.UNREAD)
                 .build()
                 .execute();
 
         assertThat(server.takeRequest().getPath())
-                .isEqualTo("/api/v1/notifications/notifications?p=0&limit=10&set_read=true");
+                .isEqualTo("/api/v1/notifications/notifications?p=0&limit=10&set_read=true&filter=1");
     }
 
     private Notification buildTestNotification() {