From d1083116e085565dcc673c7d59418820ae8c592a Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Wed, 24 Nov 2021 15:02:35 -0500
Subject: [PATCH] Use a single disptach queue for attachment/card thumbnails

---
 Tusker.xcodeproj/xcshareddata/xcschemes/Tusker.xcscheme | 5 +++++
 Tusker/Views/Attachments/AttachmentView.swift           | 9 +++++----
 Tusker/Views/Status/StatusCardView.swift                | 3 +--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Tusker.xcodeproj/xcshareddata/xcschemes/Tusker.xcscheme b/Tusker.xcodeproj/xcshareddata/xcschemes/Tusker.xcscheme
index a6172ec38b..b26b0d564f 100644
--- a/Tusker.xcodeproj/xcshareddata/xcschemes/Tusker.xcscheme
+++ b/Tusker.xcodeproj/xcshareddata/xcschemes/Tusker.xcscheme
@@ -99,6 +99,11 @@
             value = "1"
             isEnabled = "NO">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "DEBUG_BLUR_HASH"
+            value = "1"
+            isEnabled = "NO">
+         </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
diff --git a/Tusker/Views/Attachments/AttachmentView.swift b/Tusker/Views/Attachments/AttachmentView.swift
index 158d2bebde..47a64824c1 100644
--- a/Tusker/Views/Attachments/AttachmentView.swift
+++ b/Tusker/Views/Attachments/AttachmentView.swift
@@ -17,6 +17,8 @@ protocol AttachmentViewDelegate: AnyObject {
 
 class AttachmentView: GIFImageView {
     
+    static let queue = DispatchQueue(label: "Attachment Thumbnail", qos: .userInitiated, attributes: .concurrent)
+    
     weak var delegate: AttachmentViewDelegate?
 
     var playImageView: UIImageView?
@@ -108,7 +110,7 @@ class AttachmentView: GIFImageView {
         }
         
         if let hash = attachment.blurHash {
-            DispatchQueue.global(qos: .default).async { [weak self] in
+            AttachmentView.queue.async { [weak self] in
                 guard let self = self else { return }
                 let size: CGSize
                 if let meta = self.attachment.meta,
@@ -191,8 +193,7 @@ class AttachmentView: GIFImageView {
             })
         } else {
             let attachmentURL = self.attachment.url
-            // todo: use a single dispatch queue
-            DispatchQueue.global(qos: .userInitiated).async {
+            AttachmentView.queue.async {
                 let asset = AVURLAsset(url: attachmentURL)
                 let generator = AVAssetImageGenerator(asset: asset)
                 generator.appliesPreferredTrackTransform = true
@@ -237,7 +238,7 @@ class AttachmentView: GIFImageView {
     func loadGifv() {
         let attachmentURL = self.attachment.url
         let asset = AVURLAsset(url: attachmentURL)
-        DispatchQueue.global(qos: .userInitiated).async {
+        AttachmentView.queue.async {
             let generator = AVAssetImageGenerator(asset: asset)
             generator.appliesPreferredTrackTransform = true
             guard let image = try? generator.copyCGImage(at: .zero, actualTime: nil) else { return }
diff --git a/Tusker/Views/Status/StatusCardView.swift b/Tusker/Views/Status/StatusCardView.swift
index a6505ede1f..5b6005cca8 100644
--- a/Tusker/Views/Status/StatusCardView.swift
+++ b/Tusker/Views/Status/StatusCardView.swift
@@ -163,8 +163,7 @@ class StatusCardView: UIView {
         
         let imageViewSize = self.imageView.bounds.size
         
-        // todo: merge this code with AttachmentView, use a single DispatchQueue
-        DispatchQueue.global(qos: .default).async { [weak self] in
+        AttachmentView.queue.async { [weak self] in
             guard let self = self else { return }
             
             let size: CGSize