mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-01-14 20:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle image posts if url contains query string (#1300)

Browse Source 
* Handle image posts if url contains query string

Sometimes the URL to an image contains a query string, which results in Infinity showing a link instead of the image. Example: https://www.reddit.com/r/ProgrammerHumor/comments/zxsf93/like_why_the_hell_does_windows_news_leak/

* Check path for file ending instead of using regex
This commit is contained in:
Björn Tantau 2023-01-21 06:03:50 +01:00 committed by GitHub
parent 2ff6bcfcd7
commit 116be7ecc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
View File

@ -262,6 +262,8 @@ public class ParsePost {
boolean isVideo = data.getBoolean(JSONUtils.IS_VIDEO_KEY); boolean isVideo = data.getBoolean(JSONUtils.IS_VIDEO_KEY);
String url = Html.fromHtml(data.getString(JSONUtils.URL_KEY)).toString(); String url = Html.fromHtml(data.getString(JSONUtils.URL_KEY)).toString();
Uri uri = Uri.parse(url);
String path = uri.getPath();
if (!data.has(JSONUtils.PREVIEW_KEY) && previews.isEmpty()) { if (!data.has(JSONUtils.PREVIEW_KEY) && previews.isEmpty()) {
if (url.contains(permalink)) { if (url.contains(permalink)) {
@ -272,7 +274,7 @@ public class ParsePost {
voteType, nComments, upvoteRatio, flair, awards, nAwards, hidden, spoiler, nsfw, voteType, nComments, upvoteRatio, flair, awards, nAwards, hidden, spoiler, nsfw,
stickied, archived, locked, saved, isCrosspost, distinguished); stickied, archived, locked, saved, isCrosspost, distinguished);
} else { } else {
if (url.endsWith("jpg") || url.endsWith("png") || url.endsWith("jpeg")) { if (path.endsWith(".jpg") || path.endsWith(".png") || path.endsWith(".jpeg")) {
//Image post //Image post
int postType = Post.IMAGE_TYPE; int postType = Post.IMAGE_TYPE;
@ -313,7 +315,6 @@ public class ParsePost {
post.setSelfText(Utils.modifyMarkdown(Utils.trimTrailingWhitespace(data.getString(JSONUtils.SELFTEXT_KEY)))); post.setSelfText(Utils.modifyMarkdown(Utils.trimTrailingWhitespace(data.getString(JSONUtils.SELFTEXT_KEY))));
} }
Uri uri = Uri.parse(url);
String authority = uri.getAuthority(); String authority = uri.getAuthority();
if (authority != null) { if (authority != null) {
@ -379,11 +380,10 @@ public class ParsePost {
} else if (data.has(JSONUtils.PREVIEW_KEY)) { } else if (data.has(JSONUtils.PREVIEW_KEY)) {
if (data.getJSONObject(JSONUtils.PREVIEW_KEY).has(JSONUtils.REDDIT_VIDEO_PREVIEW_KEY)) { if (data.getJSONObject(JSONUtils.PREVIEW_KEY).has(JSONUtils.REDDIT_VIDEO_PREVIEW_KEY)) {
int postType = Post.VIDEO_TYPE; int postType = Post.VIDEO_TYPE;
Uri uri = Uri.parse(url);
String authority = uri.getAuthority(); String authority = uri.getAuthority();
// The hls stream inside REDDIT_VIDEO_PREVIEW_KEY can sometimes lack an audio track // The hls stream inside REDDIT_VIDEO_PREVIEW_KEY can sometimes lack an audio track
if (authority.contains("imgur.com") && (url.endsWith(".gifv") || url.endsWith(".mp4"))) { if (authority.contains("imgur.com") && (path.endsWith(".gifv") || path.endsWith(".mp4"))) {
if (url.endsWith("gifv")) { if (path.endsWith(".gifv")) {
url = url.substring(0, url.length() - 5) + ".mp4"; url = url.substring(0, url.length() - 5) + ".mp4";
} }
@ -412,7 +412,7 @@ public class ParsePost {
post.setVideoDownloadUrl(videoDownloadUrl); post.setVideoDownloadUrl(videoDownloadUrl);
} }
} else { } else {
if (url.endsWith("jpg") || url.endsWith("png")) { if (path.endsWith(".jpg") || path.endsWith(".png") || path.endsWith(".jpeg")) {
//Image post //Image post
int postType = Post.IMAGE_TYPE; int postType = Post.IMAGE_TYPE;
@ -426,7 +426,7 @@ public class ParsePost {
previews.add(new Post.Preview(url, 0, 0, "", "")); previews.add(new Post.Preview(url, 0, 0, "", ""));
} }
post.setPreviews(previews); post.setPreviews(previews);
} else if (url.endsWith("gif")) { } else if (path.endsWith(".gif")) {
//Gif post //Gif post
int postType = Post.GIF_TYPE; int postType = Post.GIF_TYPE;
post = new Post(id, fullName, subredditName, subredditNamePrefixed, author, post = new Post(id, fullName, subredditName, subredditNamePrefixed, author,
@ -437,7 +437,7 @@ public class ParsePost {
post.setPreviews(previews); post.setPreviews(previews);
post.setVideoUrl(url); post.setVideoUrl(url);
} else if (Uri.parse(url).getAuthority().contains("imgur.com") && (url.endsWith("gifv") || url.endsWith("mp4"))) { } else if (uri.getAuthority().contains("imgur.com") && (path.endsWith(".gifv") || path.endsWith(".mp4"))) {
// Imgur gifv/mp4 // Imgur gifv/mp4
int postType = Post.VIDEO_TYPE; int postType = Post.VIDEO_TYPE;
@ -454,7 +454,7 @@ public class ParsePost {
post.setVideoUrl(url); post.setVideoUrl(url);
post.setVideoDownloadUrl(url); post.setVideoDownloadUrl(url);
post.setIsImgur(true); post.setIsImgur(true);
} else if (url.endsWith("mp4")) { } else if (path.endsWith(".mp4")) {
//Video post //Video post
int postType = Post.VIDEO_TYPE; int postType = Post.VIDEO_TYPE;
@ -496,7 +496,6 @@ public class ParsePost {
post.setPreviews(previews); post.setPreviews(previews);
Uri uri = Uri.parse(url);
String authority = uri.getAuthority(); String authority = uri.getAuthority();
if (authority != null) { if (authority != null) {
@ -524,7 +523,7 @@ public class ParsePost {
} }
} }
} else { } else {
if (url.endsWith("jpg") || url.endsWith("png")) { if (path.endsWith(".jpg") || path.endsWith(".png") || path.endsWith(".jpeg")) {
//Image post //Image post
int postType = Post.IMAGE_TYPE; int postType = Post.IMAGE_TYPE;
@ -537,7 +536,7 @@ public class ParsePost {
previews.add(new Post.Preview(url, 0, 0, "", "")); previews.add(new Post.Preview(url, 0, 0, "", ""));
} }
post.setPreviews(previews); post.setPreviews(previews);
} else if (url.endsWith("mp4")) { } else if (path.endsWith(".mp4")) {
//Video post //Video post
int postType = Post.VIDEO_TYPE; int postType = Post.VIDEO_TYPE;
@ -563,7 +562,6 @@ public class ParsePost {
post.setSelfText(Utils.modifyMarkdown(Utils.trimTrailingWhitespace(data.getString(JSONUtils.SELFTEXT_KEY)))); post.setSelfText(Utils.modifyMarkdown(Utils.trimTrailingWhitespace(data.getString(JSONUtils.SELFTEXT_KEY))));
} }
Uri uri = Uri.parse(url);
String authority = uri.getAuthority(); String authority = uri.getAuthority();
if (authority != null) { if (authority != null) {
@ -593,7 +591,6 @@ public class ParsePost {
if (post.getPostType() == Post.VIDEO_TYPE) { if (post.getPostType() == Post.VIDEO_TYPE) {
try { try {
Uri uri = Uri.parse(url);
String authority = uri.getAuthority(); String authority = uri.getAuthority();
if (authority != null) { if (authority != null) {
if (authority.contains("gfycat.com")) { if (authority.contains("gfycat.com")) {
@ -676,7 +673,6 @@ public class ParsePost {
post.setPreviews(previews); post.setPreviews(previews);
} }
} else if (post.getPostType() == Post.LINK_TYPE) { } else if (post.getPostType() == Post.LINK_TYPE) {
Uri uri = Uri.parse(url);
String authority = uri.getAuthority(); String authority = uri.getAuthority();
if (authority != null) { if (authority != null) {