Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions damus.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@
BA3759972ABCCF360018D73B /* CameraPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA3759962ABCCF360018D73B /* CameraPreview.swift */; };
BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA693073295D649800ADDB87 /* UserSettingsStore.swift */; };
BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */; };
C97CD495610A53053DF15EB6 /* ThumbHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = B195F00DB0E42DA6D171C102 /* ThumbHash.swift */; };
D2277EEA2A089BD5006C3807 /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2277EE92A089BD5006C3807 /* Router.swift */; };
D5C1AFBF2E5DF7E60092F72F /* ContactCardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFBE2E5DF7E60092F72F /* ContactCardManager.swift */; };
D5C1AFC02E5DF7E60092F72F /* ContactCardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFBE2E5DF7E60092F72F /* ContactCardManager.swift */; };
Expand Down Expand Up @@ -1491,7 +1492,7 @@
D73E5EFB2C6A97F4007EB227 /* ProfilePicturesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C30AC7F29A6A53F00E2BD5A /* ProfilePicturesView.swift */; };
D73E5EFC2C6A97F4007EB227 /* DamusAppNotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D78CD5972B8990300014D539 /* DamusAppNotificationView.swift */; };
D73E5EFD2C6A97F4007EB227 /* InnerTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */; };
D73E5EFE2C6A97F4007EB227 /* (null) in Sources */ = {isa = PBXBuildFile; };
D73E5EFE2C6A97F4007EB227 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
D73E5EFF2C6A97F4007EB227 /* ZapsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879572996C45300F758CC /* ZapsView.swift */; };
D73E5F002C6A97F4007EB227 /* CustomizeZapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C9F18E129AA9B6C008C55EC /* CustomizeZapView.swift */; };
D73E5F012C6A97F4007EB227 /* ZapTypePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA3FA0F29F593D000FDB3C3 /* ZapTypePicker.swift */; };
Expand Down Expand Up @@ -1904,7 +1905,9 @@
E0E024112B7C19C20075735D /* TranslationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E024102B7C19C20075735D /* TranslationTests.swift */; };
E0EE9DD42B8E5FEA00F3002D /* ImageProcessing.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0EE9DD32B8E5FEA00F3002D /* ImageProcessing.swift */; };
E4FA1C032A24BB7F00482697 /* SearchSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4FA1C022A24BB7F00482697 /* SearchSettingsView.swift */; };
E90EA444DF1ECF6E2AC5C569 /* ThumbHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = B195F00DB0E42DA6D171C102 /* ThumbHash.swift */; };
E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990020E2955F837003BBC5A /* EditMetadataView.swift */; };
EF60FBD3ADD51A9BA4C5707A /* ThumbHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = B195F00DB0E42DA6D171C102 /* ThumbHash.swift */; };
F71694EA2A662232001F4053 /* OnboardingSuggestionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F71694E92A662232001F4053 /* OnboardingSuggestionsView.swift */; };
F71694EC2A662292001F4053 /* SuggestedUsersViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F71694EB2A662292001F4053 /* SuggestedUsersViewModel.swift */; };
F71694F22A67314D001F4053 /* SuggestedUserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F71694F12A67314D001F4053 /* SuggestedUserView.swift */; };
Expand Down Expand Up @@ -2682,6 +2685,7 @@
9C83F89229A937B900136C08 /* TextViewWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewWrapper.swift; sourceTree = "<group>"; };
9CA876E129A00CE90003B9A3 /* AttachMediaUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachMediaUtility.swift; sourceTree = "<group>"; };
ADFE73542AD4793100EC7326 /* QRScanNSECView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QRScanNSECView.swift; sourceTree = "<group>"; };
B195F00DB0E42DA6D171C102 /* ThumbHash.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ThumbHash.swift; sourceTree = "<group>"; };
B501062C2B363036003874F5 /* AuthIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthIntegrationTests.swift; sourceTree = "<group>"; usesTabs = 0; };
B51C1CE82B55A60A00E312A9 /* AddMuteItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddMuteItemView.swift; sourceTree = "<group>"; };
B51C1CE92B55A60A00E312A9 /* MuteDurationMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MuteDurationMenu.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4077,6 +4081,15 @@
path = Images;
sourceTree = "<group>";
};
55FDC8D4999715F52C16C399 /* ThumbHash */ = {
isa = PBXGroup;
children = (
B195F00DB0E42DA6D171C102 /* ThumbHash.swift */,
);
name = ThumbHash;
path = ThumbHash;
sourceTree = "<group>";
};
5C78A7752E22F84A00CF177D /* Core */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4546,6 +4559,7 @@
D7FA46E42DBDAA75002C9BB0 /* ImageCacheMigrations.swift */,
50C3E0892AA8E3F7006A4BC0 /* AVPlayer+Additions.swift */,
7C60CAEE298471A1009C80D6 /* CoreSVG.swift */,
55FDC8D4999715F52C16C399 /* ThumbHash */,
);
path = Media;
sourceTree = "<group>";
Expand Down Expand Up @@ -5556,7 +5570,7 @@
);
mainGroup = 4CE6DEDA27F7A08100C66700;
packageReferences = (
4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */,
4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1.swift" */,
4C06670228FC7EC500038D2A /* XCRemoteSwiftPackageReference "Kingfisher" */,
4CCF9AB02A1FE80B00E03CFB /* XCRemoteSwiftPackageReference "GSPlayer" */,
4C27C9302A64766F007DBC75 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */,
Expand Down Expand Up @@ -6236,6 +6250,7 @@
4C9B0DF32A65C46800CBDA21 /* ProfileEditButton.swift in Sources */,
4C32B95F2A9AD44700DC3548 /* Enum.swift in Sources */,
4C2859622A12A7F0004746F7 /* GoldSupportGradient.swift in Sources */,
EF60FBD3ADD51A9BA4C5707A /* ThumbHash.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -6854,6 +6869,7 @@
82D6FC7B2CD99F7900C925F4 /* TestData.swift in Sources */,
82D6FC7C2CD99F7900C925F4 /* ContentParsing.swift in Sources */,
82D6FC7D2CD99F7900C925F4 /* NotificationFormatter.swift in Sources */,
C97CD495610A53053DF15EB6 /* ThumbHash.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -7143,7 +7159,7 @@
D73E5EFB2C6A97F4007EB227 /* ProfilePicturesView.swift in Sources */,
D73E5EFC2C6A97F4007EB227 /* DamusAppNotificationView.swift in Sources */,
D73E5EFD2C6A97F4007EB227 /* InnerTimelineView.swift in Sources */,
D73E5EFE2C6A97F4007EB227 /* (null) in Sources */,
D73E5EFE2C6A97F4007EB227 /* BuildFile in Sources */,
D7EB00B02CD59C8D00660C07 /* PresentFullScreenItemNotify.swift in Sources */,
D73E5EFF2C6A97F4007EB227 /* ZapsView.swift in Sources */,
D73E5F002C6A97F4007EB227 /* CustomizeZapView.swift in Sources */,
Expand Down Expand Up @@ -7409,6 +7425,7 @@
D703D75B2C670A7F00A400EA /* Contacts.swift in Sources */,
D703D7812C670C2B00A400EA /* Bech32.swift in Sources */,
D73E5E1E2C6A9694007EB227 /* RelayFilters.swift in Sources */,
E90EA444DF1ECF6E2AC5C569 /* ThumbHash.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -8344,7 +8361,7 @@
kind = branch;
};
};
4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */ = {
4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1.swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/jb55/secp256k1.swift";
requirement = {
Expand Down Expand Up @@ -8440,12 +8457,12 @@
};
4C649880286E0EE300EAE2B3 /* secp256k1 */ = {
isa = XCSwiftPackageProductDependency;
package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */;
package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1.swift" */;
productName = secp256k1;
};
82D6FC802CD99FC500C925F4 /* secp256k1 */ = {
isa = XCSwiftPackageProductDependency;
package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */;
package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1.swift" */;
productName = secp256k1;
};
82D6FC832CD9A48500C925F4 /* Kingfisher */ = {
Expand All @@ -8470,7 +8487,7 @@
};
D703D7482C6709B100A400EA /* secp256k1 */ = {
isa = XCSwiftPackageProductDependency;
package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */;
package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1.swift" */;
productName = secp256k1;
};
D703D7AC2C670FA700A400EA /* MarkdownUI */ = {
Expand Down Expand Up @@ -8515,7 +8532,7 @@
};
D789D11F2AFEFBF20083A7AB /* secp256k1 */ = {
isa = XCSwiftPackageProductDependency;
package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1" */;
package = 4C64987F286E0EE300EAE2B3 /* XCRemoteSwiftPackageReference "secp256k1.swift" */;
productName = secp256k1;
};
D78DB8582C1CE9CA00F0AB12 /* SwipeActions */ = {
Expand Down
19 changes: 12 additions & 7 deletions damus/Features/Posting/Views/PostView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -343,26 +343,31 @@ struct PostView: View {
func handle_upload(media: MediaUpload) async -> Bool {
mediaUploadUnderProgress = media
let uploader = damus_state.settings.default_media_uploader

let img = getImage(media: media)
print("img size w:\(img.size.width) h:\(img.size.height)")

async let blurhash = calculate_blurhash(img: img)

// Calculate both hashes concurrently with upload for better performance
// - thumbhash: better quality, aspect ratio, alpha (newer clients)
// - blurhash: backwards compatibility with existing clients
async let thumbhashTask = calculate_thumbhash(img: img)
async let blurhashTask = calculate_blurhash(img: img)
let res = await image_upload.start(media: media, uploader: uploader, mediaType: .normal, keypair: damus_state.keypair)

mediaUploadUnderProgress = nil
switch res {
case .success(let url):
guard let url = URL(string: url) else {
self.error = "Error uploading image :("
return false
}
let blurhash = await blurhash
let meta = blurhash.map { bh in calculate_image_metadata(url: url, img: img, blurhash: bh) }
let thumbhash = await thumbhashTask
let blurhash = await blurhashTask
let meta = calculate_image_metadata(url: url, img: img, thumbhash: thumbhash, blurhash: blurhash)
let uploadedMedia = UploadedMedia(localURL: media.localURL, uploadedURL: url, metadata: meta)
uploadedMedias.append(uploadedMedia)
return true

case .failed(let error):
if let error {
self.error = error.localizedDescription
Expand Down
Loading