From e274cf89c0a833bd55c12525167a55006995f70e Mon Sep 17 00:00:00 2001 From: FineFindus Date: Sun, 10 Sep 2023 21:31:06 +0200 Subject: [PATCH] refactor: add query params --- .../android/api/requests/accounts/GetAccountBlocks.java | 6 +++++- .../android/api/requests/accounts/GetAccountMutes.java | 6 +++++- .../android/fragments/account_list/BlocksListFragment.java | 2 +- .../android/fragments/account_list/MutesListFragment.java | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountBlocks.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountBlocks.java index 64a493e43..16d0403a4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountBlocks.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountBlocks.java @@ -6,7 +6,11 @@ import org.joinmastodon.android.api.requests.HeaderPaginationRequest; import org.joinmastodon.android.model.Account; public class GetAccountBlocks extends HeaderPaginationRequest{ - public GetAccountBlocks(){ + public GetAccountBlocks(String maxID, int limit){ super(HttpMethod.GET, "/blocks", new TypeToken<>(){}); + if(maxID!=null) + addQueryParameter("max_id", maxID); + if(limit>0) + addQueryParameter("limit", limit+""); } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountMutes.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountMutes.java index 94d9dc374..966b36c51 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountMutes.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountMutes.java @@ -6,7 +6,11 @@ import org.joinmastodon.android.api.requests.HeaderPaginationRequest; import org.joinmastodon.android.model.Account; public class GetAccountMutes extends HeaderPaginationRequest{ - public GetAccountMutes(){ + public GetAccountMutes(String maxID, int limit){ super(HttpMethod.GET, "/mutes/", new TypeToken<>(){}); + if(maxID!=null) + addQueryParameter("max_id", maxID); + if(limit>0) + addQueryParameter("limit", limit+""); } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlocksListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlocksListFragment.java index 0e984d23b..38a4c80b7 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlocksListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlocksListFragment.java @@ -20,7 +20,7 @@ public class BlocksListFragment extends AccountRelatedAccountListFragment{ @Override public HeaderPaginationRequest onCreateRequest(String maxID, int count){ - return new GetAccountBlocks(); + return new GetAccountBlocks(maxID, count); } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutesListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutesListFragment.java index b19fcbb97..35ff5a4fb 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutesListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutesListFragment.java @@ -19,7 +19,7 @@ public class MutesListFragment extends AccountRelatedAccountListFragment{ @Override public HeaderPaginationRequest onCreateRequest(String maxID, int count){ - return new GetAccountMutes(); + return new GetAccountMutes(maxID, count); } @Override