From 5b285e6bef4068a8a91bb471bdc4fd20e40bbe0d Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Fri, 8 Jul 2022 14:41:20 +1000 Subject: [PATCH] fix: filter audio message attachments out of documents --- .../MediaGalleryViewModel.swift | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Session/Media Viewing & Editing/MediaGalleryViewModel.swift b/Session/Media Viewing & Editing/MediaGalleryViewModel.swift index 21dc80624..9a454597d 100644 --- a/Session/Media Viewing & Editing/MediaGalleryViewModel.swift +++ b/Session/Media Viewing & Editing/MediaGalleryViewModel.swift @@ -256,11 +256,21 @@ public class MediaGalleryViewModel { let interaction: TypedTableAlias = TypedTableAlias() let attachment: TypedTableAlias = TypedTableAlias() - return SQL(""" - \(attachment[.isVisualMedia]) = \(mediaType == .media ? true : false) AND - \(attachment[.isValid]) = true AND - \(interaction[.threadId]) = \(threadId) - """) + switch (mediaType) { + case .media: + return SQL(""" + \(attachment[.isVisualMedia]) = true AND + \(attachment[.isValid]) = true AND + \(interaction[.threadId]) = \(threadId) + """) + case .document: + return SQL(""" + \(attachment[.isVisualMedia]) = false AND + \(attachment[.isValid]) = true AND + \(attachment[.variant]) = \(Attachment.Variant.standard) AND + \(interaction[.threadId]) = \(threadId) AND + """) + } } fileprivate static let galleryOrderSQL: SQL = {