From b0f77528e15b00025bdb6f52dd34299604e8e19d Mon Sep 17 00:00:00 2001 From: cmp Date: Fri, 20 Jan 2023 23:08:30 -0600 Subject: Fix is_submitter property not being present on responses from the reveddit API. (#1335) Try to fix pushshift API deleted comment searching. --- .../infinityforreddit/comment/FetchRemovedComment.java | 4 ++-- .../infinityforreddit/comment/FetchRemovedCommentReveddit.java | 6 ++++-- .../infinityforreddit/fragments/ViewPostDetailFragment.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'app/src/main/java') diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java index 1c2e3199..24ab8d54 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java @@ -54,8 +54,8 @@ public class FetchRemovedComment { try { Response response = retrofit.create(PushshiftAPI.class).searchComments( comment.getLinkId(), - 3000, - "asc", + 1000, + "id", "id,author,body,is_submitter", after, after + 43200, // 12 Hours later diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java index b7c2e30d..ec7beea8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java @@ -55,13 +55,15 @@ public class FetchRemovedCommentReveddit { String id = result.getString(JSONUtils.ID_KEY); String author = result.getString(JSONUtils.AUTHOR_KEY); String body = Utils.modifyMarkdown(Utils.trimTrailingWhitespace(result.optString(JSONUtils.BODY_KEY))); - boolean isSubmitter = result.getBoolean(JSONUtils.IS_SUBMITTER_KEY); if (id.equals(comment.getId()) && (!author.equals(comment.getAuthor()) || !body.equals(comment.getCommentRawText()))) { comment.setAuthor(author); comment.setCommentMarkdown(body); comment.setCommentRawText(body); - comment.setSubmittedByAuthor(isSubmitter); + if (result.has(JSONUtils.IS_SUBMITTER_KEY)) { + // This doesn't seem to be present for the Reveddit API anymore... + comment.setSubmittedByAuthor(result.getBoolean(JSONUtils.IS_SUBMITTER_KEY)); + } return comment; } else { return null; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java index ee058b57..8ca0d0ea 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java @@ -1811,7 +1811,7 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic public void showRemovedComment(Comment comment, int position) { Toast.makeText(activity, R.string.fetching_removed_comment, Toast.LENGTH_SHORT).show(); - FetchRemovedComment.searchRemovedComment( + FetchRemovedComment.fetchRemovedComment( mExecutor, new Handler(), pushshiftRetrofit, comment, new FetchRemovedComment.FetchRemovedCommentListener() { @Override -- cgit v1.2.3