Skip to content

Commit

Permalink
Extra fixes for API changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@sim0n00ps
sim0n00ps committed Aug 21, 2024
1 parent 5fca265 commit f510109
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 61 deletions.
64 changes: 4 additions & 60 deletions OF DL/Helpers/APIHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1621,7 +1621,7 @@ public async Task<SinglePaidMessageCollection> GetPaidMessage(string endpoint, s
{
foreach (Messages.Medium medium in message.media)
{
if (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) && !medium.files.full.url.Contains("upload"))
{
if (medium.type == "photo" && !config.DownloadImages)
{
Expand All @@ -1647,7 +1647,7 @@ public async Task<SinglePaidMessageCollection> GetPaidMessage(string endpoint, s
singlePaidMessageCollection.SingleMessageMedia.Add(medium);
}
}
else if (medium.canView && medium.files != null && medium.files.drm != null)
else if (!messagePreviewIds.Contains(medium.id) && medium.canView && medium.files != null && medium.files.drm != null)
{
if (medium.type == "photo" && !config.DownloadImages)
{
Expand All @@ -1668,69 +1668,13 @@ public async Task<SinglePaidMessageCollection> GetPaidMessage(string endpoint, s

if (!singlePaidMessageCollection.SingleMessages.ContainsKey(medium.id))
{
await m_DBHelper.AddMedia(folder, medium.id, message.id, medium.videoSources._720, null, null, null, "Messages", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), messagePreviewIds.Contains(medium.id) ? true : false, false, null);
await m_DBHelper.AddMedia(folder, medium.id, message.id, medium.files.drm.manifest.dash, null, null, null, "Messages", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), messagePreviewIds.Contains(medium.id) ? true : false, false, null);
singlePaidMessageCollection.SingleMessages.Add(medium.id, $"{medium.files.drm.manifest.dash},{medium.files.drm.signature.dash.CloudFrontPolicy},{medium.files.drm.signature.dash.CloudFrontSignature},{medium.files.drm.signature.dash.CloudFrontKeyPairId},{medium.id},{message.id}");
singlePaidMessageCollection.SingleMessageMedia.Add(medium);
}
}
}
}
else if (messagePreviewIds.Count > 0)
{
foreach(Messages.Medium medium in message.media)
{
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)
{
continue;
}
if (medium.type == "video" && !config.DownloadVideos)
{
continue;
}
if (medium.type == "gif" && !config.DownloadVideos)
{
continue;
}
if (medium.type == "audio" && !config.DownloadAudios)
{
continue;
}
if (!singlePaidMessageCollection.SingleMessages.ContainsKey(medium.id))
{
await m_DBHelper.AddMedia(folder, medium.id, message.id, medium.files.full.url, null, null, null, "Messages", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), messagePreviewIds.Contains(medium.id) ? true : false, false, null);
singlePaidMessageCollection.SingleMessages.Add(medium.id, medium.files.full.url);
singlePaidMessageCollection.SingleMessageMedia.Add(medium);
}
}
else if (medium.canView && medium.files != null && medium.files.drm != null && messagePreviewIds.Contains(medium.id))
{
if (medium.type == "photo" && !config.DownloadImages)
{
continue;
}
if (medium.type == "video" && !config.DownloadVideos)
{
continue;
}
if (medium.type == "gif" && !config.DownloadVideos)
{
continue;
}
if (medium.type == "audio" && !config.DownloadAudios)
{
continue;
}
if (!singlePaidMessageCollection.SingleMessages.ContainsKey(medium.id))
{
await m_DBHelper.AddMedia(folder, medium.id, message.id, medium.files.drm.manifest.dash, null, null, null, "Messages", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), messagePreviewIds.Contains(medium.id) ? true : false, false, null);
singlePaidMessageCollection.SingleMessages.Add(medium.id, $"{medium.files.drm.manifest.dash},{medium.files.drm.signature.dash.CloudFrontPolicy},{medium.files.drm.signature.dash.CloudFrontSignature},{medium.files.drm.signature.dash.CloudFrontKeyPairId},{medium.id},{message.id}");
singlePaidMessageCollection.SingleMessageMedia.Add(medium);
}
}
}
}
}

return singlePaidMessageCollection;
}
Expand Down
2 changes: 1 addition & 1 deletion OF DL/Helpers/FileNameHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public async Task<Dictionary<string, string>> GetFilename(object obj1, object ob
}
else if((fileProperty == null || drmProperty == null) && propertyName == "mediaCreatedAt")
{
object source = GetNestedPropertyValue(obj2, "source.source");
object source = GetNestedPropertyValue(obj2, "files.full.url");
if(source != null)
{
DateTime lastModified = await DownloadHelper.GetMediaLastModified(source.ToString());
Expand Down

0 comments on commit f510109

Please sign in to comment.