sim0n00ps/OF-DL
52
58
Fork 19
Code Issues 31 Pull Requests Actions Packages Projects 1 Releases 17 Wiki Activity

Remove checks for "upload" in media urls to stop media being excluded incorrectly
All checks were successful
Publish Docker image / Build and push Docker image to Gitea Registry (push) Successful in 3m25s
Details
Publish release zip / build (push) Successful in 57s
Details

Browse Source
This commit is contained in:
sim0n00ps 2026-01-04 00:59:29 +00:00
parent 1c0536e766
commit 43fb74067c
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
OF DL/Helpers/APIHelper.cs
View File

@ -601,7 +601,7 @@ public class APIHelper : IAPIHelper
{
continue;
}
if (medium.canView && !medium.files.full.url.Contains("upload"))
if (medium.canView)
{
if (!return_urls.ContainsKey(medium.id))
{
@ -836,7 +836,7 @@ public class APIHelper : IAPIHelper
if (previewids.Count > 0)
{
bool has = previewids.Any(cus => cus.Equals(medium.id));
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (!paidPostCollection.PaidPosts.ContainsKey(medium.id))
{
@ -859,7 +859,7 @@ public class APIHelper : IAPIHelper
}
else
{
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (!paidPostCollection.PaidPosts.ContainsKey(medium.id))
{
@ -1028,7 +1028,7 @@ public class APIHelper : IAPIHelper
bool has = paid_post_ids.Any(cus => cus.Equals(medium.id));
if (medium.files!.full != null && !string.IsNullOrEmpty(medium.files!.full.url))
{
if (!has && !medium.files!.full.url.Contains("upload"))
if (!has)
{
if (!postCollection.Posts.ContainsKey(medium.id))
{
@ -1040,7 +1040,7 @@ public class APIHelper : IAPIHelper
}
else if (medium.files.preview != null && medium.files!.full == null)
{
if (!has && !medium.files.preview.url.Contains("upload"))
if (!has)
{
if (!postCollection.Posts.ContainsKey(medium.id))
{
@ -1144,14 +1144,11 @@ public class APIHelper : IAPIHelper
case VideoResolution.source:
if (medium.files!.full != null && !string.IsNullOrEmpty(medium.files!.full.url))
{
if (!medium.files!.full.url.Contains("upload"))
if (!singlePostCollection.SinglePosts.ContainsKey(medium.id))
{
if (!singlePostCollection.SinglePosts.ContainsKey(medium.id))
{
await m_DBHelper.AddMedia(folder, medium.id, singlePost.id, medium.files!.full.url, null, null, null, "Posts", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), postPreviewIds.Contains((long)medium.id) ? true : false, false, null);
singlePostCollection.SinglePosts.Add(medium.id, medium.files!.full.url);
singlePostCollection.SinglePostMedia.Add(medium);
}
await m_DBHelper.AddMedia(folder, medium.id, singlePost.id, medium.files!.full.url, null, null, null, "Posts", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), postPreviewIds.Contains((long)medium.id) ? true : false, false, null);
singlePostCollection.SinglePosts.Add(medium.id, medium.files!.full.url);
singlePostCollection.SinglePostMedia.Add(medium);
}
}
break;
@ -1200,14 +1197,11 @@ public class APIHelper : IAPIHelper
}
else if (medium.files.preview != null && medium.files!.full == null)
{
if (!medium.files.preview.url.Contains("upload"))
if (!singlePostCollection.SinglePosts.ContainsKey(medium.id))
{
if (!singlePostCollection.SinglePosts.ContainsKey(medium.id))
{
await m_DBHelper.AddMedia(folder, medium.id, singlePost.id, medium.files.preview.url, null, null, null, "Posts", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), postPreviewIds.Contains((long)medium.id) ? true : false, false, null);
singlePostCollection.SinglePosts.Add(medium.id, medium.files.preview.url);
singlePostCollection.SinglePostMedia.Add(medium);
}
await m_DBHelper.AddMedia(folder, medium.id, singlePost.id, medium.files.preview.url, null, null, null, "Posts", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), postPreviewIds.Contains((long)medium.id) ? true : false, false, null);
singlePostCollection.SinglePosts.Add(medium.id, medium.files.preview.url);
singlePostCollection.SinglePostMedia.Add(medium);
}
}
}
@ -1335,7 +1329,7 @@ public class APIHelper : IAPIHelper
if (medium.canView && medium.files?.drm == null)
{
bool has = paid_post_ids.Any(cus => cus.Equals(medium.id));
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (!streamsCollection.Streams.ContainsKey(medium.id))
{
@ -1480,7 +1474,7 @@ public class APIHelper : IAPIHelper
{
continue;
}
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (!archivedCollection.ArchivedPosts.ContainsKey(medium.id))
{
@ -1593,7 +1587,7 @@ public class APIHelper : IAPIHelper
{
foreach (Messages.Medium medium in list.media)
{
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (medium.type == "photo" && !config.DownloadImages)
{
@ -1649,7 +1643,7 @@ public class APIHelper : IAPIHelper
{
foreach (Messages.Medium medium in list.media)
{
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload") && messagePreviewIds.Contains(medium.id))
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && messagePreviewIds.Contains(medium.id))
{
if (medium.type == "photo" && !config.DownloadImages)
{
@ -1761,7 +1755,7 @@ public class APIHelper : IAPIHelper
{
foreach (Messages.Medium medium in message.media)
{
if (!messagePreviewIds.Contains(medium.id) && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (!messagePreviewIds.Contains(medium.id) && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (medium.type == "photo" && !config.DownloadImages)
{
@ -1787,7 +1781,7 @@ public class APIHelper : IAPIHelper
singlePaidMessageCollection.SingleMessageMedia.Add(medium);
}
}
else if (messagePreviewIds.Contains(medium.id) && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
else if (messagePreviewIds.Contains(medium.id) && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (medium.type == "photo" && !config.DownloadImages)
{
@ -1993,7 +1987,7 @@ public class APIHelper : IAPIHelper
if (previewids.Count > 0)
{
bool has = previewids.Any(cus => cus.Equals(medium.id));
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (medium.type == "photo" && !config.DownloadImages)
{
@ -2046,7 +2040,7 @@ public class APIHelper : IAPIHelper
}
else
{
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (medium.type == "photo" && !config.DownloadImages)
{
@ -2435,7 +2429,7 @@ public class APIHelper : IAPIHelper
if (previewids.Count > 0)
{
bool has = previewids.Any(cus => cus.Equals(medium.id));
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (!purchasedTabCollection.PaidPosts.PaidPosts.ContainsKey(medium.id))
@ -2459,7 +2453,7 @@ public class APIHelper : IAPIHelper
}
else
{
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (!purchasedTabCollection.PaidPosts.PaidPosts.ContainsKey(medium.id))
{
@ -2525,7 +2519,7 @@ public class APIHelper : IAPIHelper
if (paidMessagePreviewids.Count > 0)
{
bool has = paidMessagePreviewids.Any(cus => cus.Equals(medium.id));
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (!has && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (medium.type == "photo" && !config.DownloadImages)
{
@ -2578,7 +2572,7 @@ public class APIHelper : IAPIHelper
}
else
{
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url))
{
if (medium.type == "photo" && !config.DownloadImages)
{