Fill empty post requests with blank quotes,

Properly send a comment to make a vote,
Returned play and track media icons,
Load more comments

Author: MrBoomDeveloper

app/src/main/java/com/mrboomdev/awery/extensions/data/CatalogComment.java

@@ -47,7 +47,7 @@ public class CatalogComment implements CatalogSearchResults<CatalogComment> {
 	 */
 	@Json(name = "votes")
 	public Integer votes;
-	public String date;
+	public String date, id;
 
 	/**
 	 * Used only for the Frontend
@@ -56,7 +56,6 @@ public class CatalogComment implements CatalogSearchResults<CatalogComment> {
 	 */
 	@Json(ignore = true)
 	public long visualId;
-	@Json(ignore = true)
 	public int voteState = VOTE_STATE_NONE;
 
 	@Override

app/src/main/java/com/mrboomdev/awery/extensions/support/anilist/query/AnilistSearchQuery.java

@@ -132,13 +132,13 @@ public String getQuery() {
 			{
 				Page(page: __PAGE__, perPage: __ITEMS_PER_PAGE__) {
 					media(__PARAMS__) {
-						format duration
+						duration
 						countryOfOrigin
 						id description bannerImage status
 						genres averageScore episodes
 						startDate { year month day }
 						endDate { year month day }
-						coverImage { extraLarge large color medium }
+						coverImage { extraLarge large medium }
 						tags { name }
 						title { romaji(stylised: false) english(stylised: false) native(stylised: false) }
 					}

app/src/main/java/com/mrboomdev/awery/extensions/support/js/JsBridge.java

@@ -1,6 +1,7 @@
 package com.mrboomdev.awery.extensions.support.js;
 
 import static com.mrboomdev.awery.app.AweryLifecycle.getAnyContext;
+import static com.mrboomdev.awery.util.NiceUtils.doIfNotNull;
 import static com.mrboomdev.awery.util.NiceUtils.stream;
 
 import android.util.Log;
@@ -128,8 +129,8 @@ public Object fetch(@NonNull ScriptableObject options) {
 			}
 		}
 
-		if(options.has("method", options)) {
-			var method = options.get("method").toString().toLowerCase(Locale.ROOT);
+		doIfNotNull(stringFromJs(options.get("method")), method -> {
+			method = method.toLowerCase(Locale.ROOT);
 
 			request.setMethod(options.has("method", options) ? switch(method) {
 				case "get" -> HttpClient.Method.GET;
@@ -139,7 +140,12 @@ public Object fetch(@NonNull ScriptableObject options) {
 				case "patch" -> HttpClient.Method.PATCH;
 				default -> throw new IllegalArgumentException("Unsupported method: " + method);
 			} : null);
-		}
+
+			if(method.equals("post") && !options.has("body", options)) {
+				request.setBody("", MimeTypes.TEXT);
+
+			}
+		});
 
 		request.callAsync(getAnyContext(), new HttpClient.HttpCallback() {
 			@Override

app/src/main/java/com/mrboomdev/awery/extensions/support/js/JsComment.java

@@ -37,6 +37,7 @@ protected JsComment(@NonNull ScriptableObject o) {
 		comments = o.has("comments", o) ? intFromJs(o.get("comments", o)) : CatalogComment.DISABLED;
 		votes = o.has("votes", o) ? fromJs(o.get("votes", o), Integer.class) : null;
 		voteState = intFromJs(o.get("voteState", o));
+		id = stringFromJs(o.get("id", o));
 
 		canComment = booleanFromJs(o.get("canComment", o));
 		hasNextPage = booleanFromJs(o.get("hasNextPage", o));
@@ -46,17 +47,13 @@ protected JsComment(@NonNull ScriptableObject o) {
 
 	public static Scriptable createJsComment(Context context, Scriptable scope, CatalogComment comment) {
 		if(comment == null) return null;
-
-		if(comment instanceof JsComment jsComment) {
-			return jsComment.customData;
-		}
-
 		var o = context.newObject(scope);
 
 		o.put("authorName", o, comment.authorName);
 		o.put("authorAvatar", o, comment.authorAvatar);
 		o.put("text", o, comment.text);
 		o.put("date", o, comment.date);
+		o.put("id", o, comment.id);
 
 		o.put("likes", o, comment.likes);
 		o.put("dislikes", o, comment.dislikes);

app/src/main/java/com/mrboomdev/awery/extensions/support/js/JsProvider.java

@@ -356,14 +356,16 @@ public void voteComment(CatalogComment comment, @NonNull ResponseCallback<Catalo
 		manager.postRunnable(() -> {
 			if(scope.get("aweryVoteComment") instanceof Function fun) {
 				try {
-					fun.call(context, scope, null, new Object[]{ comment, (Callback<NativeObject>) (o, e) -> {
-						if(e != null) {
-							callback.onFailure(new JsException(e));
-							return;
-						}
+					fun.call(context, scope, null, new Object[]{
+							JsComment.createJsComment(context, scope, comment),
+							(Callback<NativeObject>) (o, e) -> {
+								if(e != null) {
+									callback.onFailure(new JsException(e));
+									return;
+								}
 
-						callback.onSuccess(new JsComment(o));
-					}});
+								callback.onSuccess(new JsComment(o));
+							}});
 				} catch(Throwable e) {
 					callback.onFailure(e);
 				}

app/src/main/java/com/mrboomdev/awery/ui/fragments/MediaCommentsFragment.java

@@ -62,12 +62,15 @@
 import java9.util.Objects;
 
 public class MediaCommentsFragment extends Fragment {
+	private static final int LAST_PAGE = -1;
 	private static final String TAG = "MediaCommentsFragment";
 	private final SingleViewAdapter.BindingSingleViewAdapter<LayoutLoadingBinding> loadingAdapter;
 	private final WeakHashMap<CatalogComment, Parcelable> scrollPositions = new WeakHashMap<>();
+	private final WeakHashMap<CatalogComment, Integer> pages = new WeakHashMap<>();
 	private final CommentsAdapter commentsAdapter = new CommentsAdapter();
 	private final List<CatalogComment> currentCommentsPath = new ArrayList<>();
 	private final Runnable backPressCallback;
+	private boolean isLoading;
 	private ExtensionProvider selectedProvider;
 	private RecyclerView recycler;
 	private Runnable onCloseRequestListener;
@@ -130,11 +133,11 @@ public void setMedia(CatalogMedia media) {
 		this.media = media;
 		if(adapter == null) return;
 
-		loadData(null, null);
+		loadData(null, null, 0);
 	}
 
 	private void setComment(@Nullable CatalogComment comment, CatalogComment reloadThis) {
-		this.recycler.scrollToPosition(0);
+		//this.recycler.scrollToPosition(0);
 		this.comment = comment;
 
 		if(comment != null) {
@@ -167,9 +170,13 @@ private void setComment(@Nullable CatalogComment comment, CatalogComment reloadT
 			var layoutManager = requireNonNull(recycler.getLayoutManager());
 			layoutManager.onRestoreInstanceState(scrollPosition);
 		}
+
+		if(comment != null && !comment.hasNextPage()) {
+			reachedEnd();
+		}
 	}
 
-	private void loadData(CatalogComment parent, CatalogComment reloadThis) {
+	private void loadData(CatalogComment parent, CatalogComment reloadThis, int page) {
 		if(this.comment != null) {
 			var layoutManager = requireNonNull(recycler.getLayoutManager());
 			scrollPositions.put(this.comment, layoutManager.onSaveInstanceState());
@@ -199,16 +206,30 @@ private void loadData(CatalogComment parent, CatalogComment reloadThis) {
 		}
 
 		var request = new ReadMediaCommentsRequest()
-				.setPage(0)
+				.setPage(page)
 				.setParentComment(parent)
 				.setMedia(media);
 
+		isLoading = true;
+
 		selectedProvider.readMediaComments(request, new ExtensionProvider.ResponseCallback<>() {
 			@Override
-			public void onSuccess(CatalogComment parent) {
+			public void onSuccess(CatalogComment newComment) {
 				runOnUiThread(() -> {
 					if(getContext() == null) return;
-					setComment(parent, reloadThis);
+					isLoading = false;
+
+					if(page == 0) {
+						pages.put(newComment, 0);
+						setComment(newComment, reloadThis);
+						return;
+					}
+
+					commentsAdapter.addData(newComment);
+
+					if(!newComment.hasNextPage()) {
+						reachedEnd();
+					}
 				}, recycler);
 			}
 
@@ -217,6 +238,7 @@ public void onFailure(Throwable e) {
 				loadingAdapter.getBinding(binding -> runOnUiThread(() -> {
 					if(getContext() == null) return;
 					swipeRefresher.setRefreshing(false);
+					isLoading = false;
 
 					if(parent != null && (reloadThis == null ||
 							(e instanceof JsException jsE && Objects.equals(jsE.getErrorId(), JsException.ERROR_NOTHING_FOUND)))) {
@@ -242,6 +264,18 @@ public void onFailure(Throwable e) {
 		});
 	}
 
+	private void reachedEnd() {
+		pages.put(comment, LAST_PAGE);
+
+		loadingAdapter.getBinding(binding -> {
+			binding.info.setVisibility(View.VISIBLE);
+			binding.progressBar.setVisibility(View.GONE);
+			binding.title.setText(R.string.you_reached_end);
+			binding.message.setText(R.string.you_reached_end_description);
+			loadingAdapter.setEnabled(true);
+		});
+	}
+
 	@Override
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
 		providers = stream(ExtensionsFactory.getExtensions(Extension.FLAG_WORKING))
@@ -257,14 +291,21 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 			selectedProvider = providers.get(0);
 		}
 
+		recycler.addOnScrollListener(new RecyclerView.OnScrollListener() {
+			@Override
+			public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+				tryLoadMore();
+			}
+		});
+
 		setMedia(media);
 	}
 
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		swipeRefresher = new SwipeRefreshLayout(inflater.getContext());
-		swipeRefresher.setOnRefreshListener(() -> loadData(comment, comment));
+		swipeRefresher.setOnRefreshListener(() -> loadData(comment, comment, 0));
 
 		var parentLayout = new LinearLayoutCompat(inflater.getContext());
 		parentLayout.setOrientation(LinearLayoutCompat.VERTICAL);
@@ -284,7 +325,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
 		adapter = new ConcatAdapter(new ConcatAdapter.Config.Builder()
 				.setStableIdMode(ConcatAdapter.Config.StableIdMode.ISOLATED_STABLE_IDS).build(),
-				loadingAdapter, commentsAdapter);
+				commentsAdapter, loadingAdapter);
 
 		recycler.setAdapter(adapter);
 		parentLayout.addView(recycler, createLinearParams(MATCH_PARENT, 0, 1));
@@ -318,7 +359,7 @@ public void onSuccess(CatalogComment comment) {
 						/* So apparently people wanna to see all comments even after you did post a new one.
 						   Weird... */
 						loadData(MediaCommentsFragment.this.comment,
-								MediaCommentsFragment.this.comment);
+								MediaCommentsFragment.this.comment, 0);
 
 						sendBinding.loadingIndicator.setVisibility(View.GONE);
 						sendBinding.sendButton.setVisibility(View.VISIBLE);
@@ -349,6 +390,25 @@ public void onFailure(Throwable e) {
 		return swipeRefresher;
 	}
 
+	private void tryLoadMore() {
+		if(media == null) return;
+		var page = pages.get(comment);
+
+		if(page == null) {
+			throw new NullPointerException("Page not found!");
+		}
+
+		if(!isLoading && page != LAST_PAGE) {
+			var lastIndex = comment.size() - 1;
+
+			if(recycler.getLayoutManager() instanceof LinearLayoutManager manager
+					&& manager.findLastVisibleItemPosition() >= lastIndex) {
+				pages.put(comment, page + 1);
+				loadData(comment, comment, page + 1);
+			}
+		}
+	}
+
 	private class CommentsAdapter extends RecyclerView.Adapter<CommentViewHolder> {
 		private final UniqueIdGenerator idGenerator = new UniqueIdGenerator();
 		private CatalogComment root;
@@ -373,6 +433,18 @@ public void setData(@Nullable CatalogComment root) {
 			notifyDataSetChanged();
 		}
 
+		public void addData(@Nullable CatalogComment root) {
+			if(root == null) return;
+
+			for(var item : root.items) {
+				item.visualId = idGenerator.getLong();
+			}
+
+			var wasSize = comment.size();
+			this.root.items.addAll(root.items);
+			notifyItemRangeInserted(wasSize, root.items.size());
+		}
+
 		@NonNull
 		@Override
 		public CommentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -384,7 +456,7 @@ public CommentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewT
 				var comment = holder.getComment();
 				if(comment == MediaCommentsFragment.this.comment) return;
 
-				loadData(comment, null);
+				loadData(comment, null, 0);
 			});
 
 			return holder;

app/src/main/java/com/mrboomdev/awery/util/NiceUtils.java

@@ -27,6 +27,12 @@ public static <A, B> A returnIfNotNull(B param, Callbacks.Result1<A, B> callback
 		return param == null ? null : callback.run(param);
 	}
 
+	public static <A> void doIfNotNull(A param, Callbacks.Callback1<A> callback) {
+		if(param != null) {
+			callback.run(param);
+		}
+	}
+
 	/**
 	 * @return The first item in the collection that matches the query
 	 * @author MrBoomDev

app/src/main/java/com/mrboomdev/awery/util/exceptions/ExceptionDescriptor.java

@@ -34,12 +34,12 @@ public ExceptionDescriptor(@NonNull Throwable t) {
 	}
 
 	public static Throwable unwrap(Throwable t) {
-		if(!isUnknownException(t)) {
-			return t;
+		if(t instanceof WrappedException wrappedException) {
+			return unwrap(wrappedException.getWrappedException());
 		}
 
-		while(t instanceof WrappedException e) {
-			t = e.getWrappedException();
+		if(!isUnknownException(t)) {
+			return t;
 		}
 
 		var firstCause = t.getCause();