mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-01-03 14:40:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fetch comments

Browse source
This commit is contained in:
Thomas 2023-07-08 16:41:37 +02:00
parent 58f193e71b
commit 7cfe2cbecf
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/app/fedilab/android/mastodon/client/entities/lemmy/LemmyPost.java
View file

@ -80,7 +80,7 @@ public class LemmyPost implements Serializable {
account.avatar_static = lemmyPost.creator.avatar; account.avatar_static = lemmyPost.creator.avatar;
status.account = account; status.account = account;
if (lemmyPost.post.thumbnail_url != null) { if (lemmyPost.comment == null && lemmyPost.post.thumbnail_url != null) {
List<Attachment> attachmentList = new ArrayList<>(); List<Attachment> attachmentList = new ArrayList<>();
Attachment attachment = new Attachment(); Attachment attachment = new Attachment();
attachment.type = "image"; attachment.type = "image";
@ -91,6 +91,17 @@ public class LemmyPost implements Serializable {
} }
attachmentList.add(attachment); attachmentList.add(attachment);
status.media_attachments = attachmentList; status.media_attachments = attachmentList;
} else if (lemmyPost.comment != null && lemmyPost.comment.thumbnail_url != null) {
List<Attachment> attachmentList = new ArrayList<>();
Attachment attachment = new Attachment();
attachment.type = "image";
attachment.url = lemmyPost.comment.thumbnail_url;
attachment.preview_url = lemmyPost.comment.thumbnail_url;
if (lemmyPost.post.nsfw) {
status.sensitive = true;
}
attachmentList.add(attachment);
status.media_attachments = attachmentList;
} }
return status; return status;
} }

5
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
View file

@ -191,7 +191,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
private final boolean minified; private final boolean minified;
private final Timeline.TimeLineEnum timelineType; private final Timeline.TimeLineEnum timelineType;
public RemoteInstance.InstanceType type; public RemoteInstance.InstanceType type;
public String lemmy_post_id;
public PinnedTimeline pinnedTimeline; public PinnedTimeline pinnedTimeline;
private final boolean canBeFederated; private final boolean canBeFederated;
private final boolean checkRemotely; private final boolean checkRemotely;
@ -1996,11 +1995,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
} else { } else {
if (remote) { if (remote) {
//Lemmy main post that should open Lemmy threads //Lemmy main post that should open Lemmy threads
if (adapter instanceof StatusAdapter && ((StatusAdapter) adapter).type == RemoteInstance.InstanceType.LEMMY && ((StatusAdapter) adapter).lemmy_post_id == null) { if (adapter instanceof StatusAdapter && ((StatusAdapter) adapter).type == RemoteInstance.InstanceType.LEMMY) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putSerializable(Helper.ARG_REMOTE_INSTANCE, ((StatusAdapter) adapter).pinnedTimeline); bundle.putSerializable(Helper.ARG_REMOTE_INSTANCE, ((StatusAdapter) adapter).pinnedTimeline);
bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.REMOTE); bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.REMOTE);
bundle.putSerializable(Helper.ARG_LEMMY_POST_ID, ((StatusAdapter) adapter).lemmy_post_id); bundle.putString(Helper.ARG_LEMMY_POST_ID, status.id);
Intent intent = new Intent(context, TimelineActivity.class); Intent intent = new Intent(context, TimelineActivity.class);
intent.putExtras(bundle); intent.putExtras(bundle);
context.startActivity(intent); context.startActivity(intent);

1
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java
View file

@ -632,7 +632,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
if (pinnedTimeline != null && pinnedTimeline.remoteInstance != null) { if (pinnedTimeline != null && pinnedTimeline.remoteInstance != null) {
statusAdapter.type = pinnedTimeline.remoteInstance.type; statusAdapter.type = pinnedTimeline.remoteInstance.type;
} }
statusAdapter.lemmy_post_id = lemmy_post_id;
//--------------- //---------------
if (statusReport != null) { if (statusReport != null) {