Skip to content

feat: Add Blossom media server upload support #3438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alltheseas wants to merge 12 commits into
base: master
Choose a base branch
from
+2,617 −20
Open

feat: Add Blossom media server upload support #3438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f5c6790
feat: Add core Blossom media server client
alltheseas Dec 15, 2025
211cdeb
feat: Add Blossom server list model and manager (kind 10063)
alltheseas Dec 15, 2025
62ac5e4
feat: Add Blossom media server settings UI
alltheseas Dec 15, 2025
70b7ece
feat: Integrate Blossom uploads with media upload flow
alltheseas Dec 15, 2025
1e1c67d
Fix misleading Blossom comment in HomeModel
alltheseas Dec 18, 2025
3537563
Add progress delegate support for Blossom uploads
alltheseas Dec 18, 2025
3a147f6
Add Blossom unit tests
alltheseas Dec 18, 2025
a645309
Add streaming upload support for large video files
alltheseas Dec 18, 2025
bf0d10f
Add nostr.download to Blossom server suggestions
alltheseas Dec 18, 2025
89f3d88
Add Blossom mirror support (BUD-04)
alltheseas Dec 18, 2025
146c41a
Add mirror settings UI and kind 10063 publication (BUD-03)
alltheseas Dec 18, 2025
62814d0
Address code review feedback on Blossom implementation
alltheseas Dec 18, 2025
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
80 changes: 80 additions & 0 deletions damus.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,32 @@
objects = {

/* Begin PBXBuildFile section */
BL0SS0M0000000000000011 /* BlossomTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000001 /* BlossomTypes.swift */; };
BL0SS0M0000000000000012 /* BlossomTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000001 /* BlossomTypes.swift */; };
BL0SS0M0000000000000013 /* BlossomTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000001 /* BlossomTypes.swift */; };
BL0SS0M0000000000000021 /* BlossomAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000002 /* BlossomAuth.swift */; };
BL0SS0M0000000000000022 /* BlossomAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000002 /* BlossomAuth.swift */; };
BL0SS0M0000000000000023 /* BlossomAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000002 /* BlossomAuth.swift */; };
BL0SS0M0000000000000031 /* BlossomUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000003 /* BlossomUploader.swift */; };
BL0SS0M0000000000000032 /* BlossomUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000003 /* BlossomUploader.swift */; };
BL0SS0M0000000000000033 /* BlossomUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000003 /* BlossomUploader.swift */; };
BL0SS0M0000000000000041 /* BlossomServerList.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000004 /* BlossomServerList.swift */; };
BL0SS0M0000000000000042 /* BlossomServerList.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000004 /* BlossomServerList.swift */; };
BL0SS0M0000000000000043 /* BlossomServerList.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000004 /* BlossomServerList.swift */; };
BL0SS0M0000000000000051 /* BlossomServerListManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000005 /* BlossomServerListManager.swift */; };
BL0SS0M0000000000000052 /* BlossomServerListManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000005 /* BlossomServerListManager.swift */; };
BL0SS0M0000000000000053 /* BlossomServerListManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000005 /* BlossomServerListManager.swift */; };
BL0SS0M0000000000000061 /* MediaServerSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000006 /* MediaServerSettingsView.swift */; };
BL0SS0M0000000000000062 /* MediaServerSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000006 /* MediaServerSettingsView.swift */; };
BL0SS0M0000000000000063 /* MediaServerSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000006 /* MediaServerSettingsView.swift */; };
BL0SS0M0000000000000071 /* AddBlossomServerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000007 /* AddBlossomServerView.swift */; };
BL0SS0M0000000000000072 /* AddBlossomServerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000007 /* AddBlossomServerView.swift */; };
BL0SS0M0000000000000073 /* AddBlossomServerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000007 /* AddBlossomServerView.swift */; };
BL0SS0M0000000000000014 /* BlossomTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000001 /* BlossomTypes.swift */; };
BL0SS0M0000000000000024 /* BlossomAuth.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000002 /* BlossomAuth.swift */; };
BL0SS0M0000000000000034 /* BlossomUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000003 /* BlossomUploader.swift */; };
BL0SS0M0000000000000044 /* BlossomServerList.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000004 /* BlossomServerList.swift */; };
BL0SS0M0000000000000054 /* BlossomServerListManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0SS0M0000000000000005 /* BlossomServerListManager.swift */; };
0E8A4BB72AE4359200065E81 /* NostrFilter+Hashable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E8A4BB62AE4359200065E81 /* NostrFilter+Hashable.swift */; };
2710433D2E6BFE340005C3B0 /* PostingTimelineSwitcherView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2710433C2E6BFE2A0005C3B0 /* PostingTimelineSwitcherView.swift */; };
2710433E2E6BFE340005C3B0 /* PostingTimelineSwitcherView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2710433C2E6BFE2A0005C3B0 /* PostingTimelineSwitcherView.swift */; };
Expand Down Expand Up @@ -1077,6 +1103,8 @@
9CA876E229A00CEA0003B9A3 /* AttachMediaUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CA876E129A00CE90003B9A3 /* AttachMediaUtility.swift */; };
ADFE73552AD4793100EC7326 /* QRScanNSECView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADFE73542AD4793100EC7326 /* QRScanNSECView.swift */; };
B501062D2B363036003874F5 /* AuthIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501062C2B363036003874F5 /* AuthIntegrationTests.swift */; };
BL0550M0000000000000001A /* BlossomAuthTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0550M0000000000000001B /* BlossomAuthTests.swift */; };
BL0550M0000000000000002A /* BlossomUploaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BL0550M0000000000000002B /* BlossomUploaderTests.swift */; };
B51C1CEA2B55A60A00E312A9 /* AddMuteItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51C1CE82B55A60A00E312A9 /* AddMuteItemView.swift */; };
B51C1CEB2B55A60A00E312A9 /* MuteDurationMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51C1CE92B55A60A00E312A9 /* MuteDurationMenu.swift */; };
B533694E2B66D791008A805E /* MutelistManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B533694D2B66D791008A805E /* MutelistManager.swift */; };
Expand Down Expand Up @@ -2683,6 +2711,8 @@
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>"; };
B501062C2B363036003874F5 /* AuthIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthIntegrationTests.swift; sourceTree = "<group>"; usesTabs = 0; };
BL0550M0000000000000001B /* BlossomAuthTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlossomAuthTests.swift; sourceTree = "<group>"; };
BL0550M0000000000000002B /* BlossomUploaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlossomUploaderTests.swift; sourceTree = "<group>"; };
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>"; };
B533694D2B66D791008A805E /* MutelistManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutelistManager.swift; sourceTree = "<group>"; usesTabs = 0; };
Expand Down Expand Up @@ -2820,6 +2850,13 @@
D7DB1FF22D5AC5E400CF06DA /* LICENSES */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSES; sourceTree = "<group>"; };
D7DB93042D66A43B00DA1EE5 /* Undistractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Undistractor.swift; sourceTree = "<group>"; };
D7DB93092D69485A00DA1EE5 /* NIP65.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIP65.swift; sourceTree = "<group>"; };
BL0SS0M0000000000000001 /* BlossomTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlossomTypes.swift; sourceTree = "<group>"; };
BL0SS0M0000000000000002 /* BlossomAuth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlossomAuth.swift; sourceTree = "<group>"; };
BL0SS0M0000000000000003 /* BlossomUploader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlossomUploader.swift; sourceTree = "<group>"; };
BL0SS0M0000000000000004 /* BlossomServerList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlossomServerList.swift; sourceTree = "<group>"; };
BL0SS0M0000000000000005 /* BlossomServerListManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlossomServerListManager.swift; sourceTree = "<group>"; };
BL0SS0M0000000000000006 /* MediaServerSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaServerSettingsView.swift; sourceTree = "<group>"; };
BL0SS0M0000000000000007 /* AddBlossomServerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddBlossomServerView.swift; sourceTree = "<group>"; };
D7DEEF2E2A8C021E00E0C99F /* NostrEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrEventTests.swift; sourceTree = "<group>"; };
D7DF58312DFCF18800E9AD28 /* SendPaymentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendPaymentView.swift; sourceTree = "<group>"; };
D7E5B2D22EA0187B00CF47AC /* StreamPipelineDiagnostics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreamPipelineDiagnostics.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3851,6 +3888,8 @@
D72A2CFF2AD9B66B002AFF62 /* EventViewTests.swift */,
D7315A2B2ACDF4DA0036E30A /* DamusCacheManagerTests.swift */,
B501062C2B363036003874F5 /* AuthIntegrationTests.swift */,
BL0550M0000000000000001B /* BlossomAuthTests.swift */,
BL0550M0000000000000002B /* BlossomUploaderTests.swift */,
E0E024102B7C19C20075735D /* TranslationTests.swift */,
E06336A92B75832100A88E6B /* ImageMetadataTest.swift */,
D7CBD1D52B8D509800BFD889 /* DamusPurpleImpendingExpirationTests.swift */,
Expand Down Expand Up @@ -4080,6 +4119,7 @@
5C78A7752E22F84A00CF177D /* Core */ = {
isa = PBXGroup;
children = (
BL0SS0M0000000000000000 /* Blossom */,
5C78A7BD2E306D6000CF177D /* Storage */,
5C78A77C2E22FE7100CF177D /* Networking */,
5C78A7782E22FAE700CF177D /* DIPs */,
Expand Down Expand Up @@ -4114,6 +4154,18 @@
path = NIP98;
sourceTree = "<group>";
};
BL0SS0M0000000000000000 /* Blossom */ = {
isa = PBXGroup;
children = (
BL0SS0M0000000000000001 /* BlossomTypes.swift */,
BL0SS0M0000000000000002 /* BlossomAuth.swift */,
BL0SS0M0000000000000003 /* BlossomUploader.swift */,
BL0SS0M0000000000000004 /* BlossomServerList.swift */,
BL0SS0M0000000000000005 /* BlossomServerListManager.swift */,
);
path = Blossom;
sourceTree = "<group>";
};
5C78A7782E22FAE700CF177D /* DIPs */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4433,6 +4485,8 @@
E4FA1C022A24BB7F00482697 /* SearchSettingsView.swift */,
5053ACA62A56DF3B00851AE3 /* DeveloperSettingsView.swift */,
D7FD12252BD345A700CF195B /* FirstAidSettingsView.swift */,
BL0SS0M0000000000000006 /* MediaServerSettingsView.swift */,
BL0SS0M0000000000000007 /* AddBlossomServerView.swift */,
4CE4F9DD2852768D00C00DD9 /* ConfigView.swift */,
);
path = Views;
Expand Down Expand Up @@ -5748,6 +5802,13 @@
4CF0ABEE29844B5500D66079 /* AnyEncodable.swift in Sources */,
B57B4C662B312C3700A232C0 /* NostrAuth.swift in Sources */,
D7DB930B2D69486700DA1EE5 /* NIP65.swift in Sources */,
BL0SS0M0000000000000011 /* BlossomTypes.swift in Sources */,
BL0SS0M0000000000000021 /* BlossomAuth.swift in Sources */,
BL0SS0M0000000000000031 /* BlossomUploader.swift in Sources */,
BL0SS0M0000000000000041 /* BlossomServerList.swift in Sources */,
BL0SS0M0000000000000051 /* BlossomServerListManager.swift in Sources */,
BL0SS0M0000000000000061 /* MediaServerSettingsView.swift in Sources */,
BL0SS0M0000000000000071 /* AddBlossomServerView.swift in Sources */,
4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */,
4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
2710433D2E6BFE340005C3B0 /* PostingTimelineSwitcherView.swift in Sources */,
Expand Down Expand Up @@ -6282,6 +6343,8 @@
F944F56E29EA9CCC0067B3BF /* DamusParseContentTests.swift in Sources */,
D7BEE6F92D37B37400CF659F /* DraftTests.swift in Sources */,
B501062D2B363036003874F5 /* AuthIntegrationTests.swift in Sources */,
BL0550M0000000000000001A /* BlossomAuthTests.swift in Sources */,
BL0550M0000000000000002A /* BlossomUploaderTests.swift in Sources */,
4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */,
D72A2D052AD9C1B5002AFF62 /* MockDamusState.swift in Sources */,
E06336AA2B75832100A88E6B /* ImageMetadataTest.swift in Sources */,
Expand Down Expand Up @@ -6670,6 +6733,13 @@
82D6FBE12CD99F7900C925F4 /* NotificationSettingsView.swift in Sources */,
82D6FBE22CD99F7900C925F4 /* AppearanceSettingsView.swift in Sources */,
D7DB930A2D69486700DA1EE5 /* NIP65.swift in Sources */,
BL0SS0M0000000000000012 /* BlossomTypes.swift in Sources */,
BL0SS0M0000000000000022 /* BlossomAuth.swift in Sources */,
BL0SS0M0000000000000032 /* BlossomUploader.swift in Sources */,
BL0SS0M0000000000000042 /* BlossomServerList.swift in Sources */,
BL0SS0M0000000000000052 /* BlossomServerListManager.swift in Sources */,
BL0SS0M0000000000000062 /* MediaServerSettingsView.swift in Sources */,
BL0SS0M0000000000000072 /* AddBlossomServerView.swift in Sources */,
82D6FBE32CD99F7900C925F4 /* KeySettingsView.swift in Sources */,
82D6FBE42CD99F7900C925F4 /* ZapSettingsView.swift in Sources */,
82D6FBE52CD99F7900C925F4 /* TranslationSettingsView.swift in Sources */,
Expand Down Expand Up @@ -7152,6 +7222,13 @@
D73E5F022C6A97F4007EB227 /* ZapUserView.swift in Sources */,
D73E5F032C6A97F4007EB227 /* ProfileZapLinkView.swift in Sources */,
D7DB930C2D69486700DA1EE5 /* NIP65.swift in Sources */,
BL0SS0M0000000000000013 /* BlossomTypes.swift in Sources */,
BL0SS0M0000000000000023 /* BlossomAuth.swift in Sources */,
BL0SS0M0000000000000033 /* BlossomUploader.swift in Sources */,
BL0SS0M0000000000000043 /* BlossomServerList.swift in Sources */,
BL0SS0M0000000000000053 /* BlossomServerListManager.swift in Sources */,
BL0SS0M0000000000000063 /* MediaServerSettingsView.swift in Sources */,
BL0SS0M0000000000000073 /* AddBlossomServerView.swift in Sources */,
D73E5F042C6A97F4007EB227 /* AboutView.swift in Sources */,
D73E5F052C6A97F4007EB227 /* ProfileName.swift in Sources */,
D73E5F062C6A97F4007EB227 /* ProfilePictureSelector.swift in Sources */,
Expand Down Expand Up @@ -7509,6 +7586,9 @@
D7CB5D422B116F8900AD4105 /* Contacts.swift in Sources */,
D7CB5D5D2B1176B200AD4105 /* MediaUploader.swift in Sources */,
D7DBD41F2B02F15E002A6197 /* NostrKind.swift in Sources */,
BL0SS0M0000000000000014 /* BlossomTypes.swift in Sources */,
BL0SS0M0000000000000024 /* BlossomAuth.swift in Sources */,
BL0SS0M0000000000000034 /* BlossomUploader.swift in Sources */,
D7CE1B3C2B0BE719002EDAD4 /* TableVerifier.swift in Sources */,
D7EDED2F2B128E8A0018B19C /* CollectionExtension.swift in Sources */,
D7CCFC082B05834500323D86 /* NoteId.swift in Sources */,
Expand Down
Loading