tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into local-relay-model

Browse Source 
Logical merge errors fixed manually

Changelog-None
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit is contained in:
Daniel D’Aquino
2025-10-22 11:37:09 -07:00
parent 9555145359 8122a8a580
commit 67d2b249b6
22 changed files with 790 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
damus.xcodeproj/project.pbxproj
View File

@@ -8,6 +8,9 @@
/* Begin PBXBuildFile section */
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 */; };
2710433F2E6BFE340005C3B0 /* PostingTimelineSwitcherView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2710433C2E6BFE2A0005C3B0 /* PostingTimelineSwitcherView.swift */; };
3165648B295B70D500C64604 /* LinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3165648A295B70D500C64604 /* LinkView.swift */; };
3169CAE6294E69C000EE4006 /* EmptyTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3169CAE5294E69C000EE4006 /* EmptyTimelineView.swift */; };
3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3169CAEC294FCCFC00EE4006 /* Constants.swift */; };
@@ -1029,6 +1032,19 @@
BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA693073295D649800ADDB87 /* UserSettingsStore.swift */; };
BAB68BED29543FA3007BA466 /* SelectWalletView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB68BEC29543FA3007BA466 /* SelectWalletView.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 */; };
D5C1AFC12E5DF7E60092F72F /* ContactCardManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFBE2E5DF7E60092F72F /* ContactCardManager.swift */; };
D5C1AFC42E5DFF700092F72F /* ContactCardManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFC32E5DFF700092F72F /* ContactCardManagerMock.swift */; };
D5C1AFC52E5DFF700092F72F /* ContactCardManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFC32E5DFF700092F72F /* ContactCardManagerMock.swift */; };
D5C1AFC62E5DFF700092F72F /* ContactCardManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFC32E5DFF700092F72F /* ContactCardManagerMock.swift */; };
D5C1AFC82E5E00690092F72F /* ContactCardManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFC72E5E00690092F72F /* ContactCardManagerTests.swift */; };
D5C1AFCA2E5EE12B0092F72F /* ContactCardNotify.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFC92E5EE12B0092F72F /* ContactCardNotify.swift */; };
D5C1AFCB2E5EE12B0092F72F /* ContactCardNotify.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFC92E5EE12B0092F72F /* ContactCardNotify.swift */; };
D5C1AFCC2E5EE12B0092F72F /* ContactCardNotify.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFC92E5EE12B0092F72F /* ContactCardNotify.swift */; };
D5C1AFD32E5EE2820092F72F /* FavoriteButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFD12E5EE2820092F72F /* FavoriteButtonView.swift */; };
D5C1AFD42E5EE2820092F72F /* FavoriteButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFD12E5EE2820092F72F /* FavoriteButtonView.swift */; };
D5C1AFD52E5EE2820092F72F /* FavoriteButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C1AFD12E5EE2820092F72F /* FavoriteButtonView.swift */; };
D703D7192C66E47100A400EA /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D703D7182C66E47100A400EA /* UniformTypeIdentifiers.framework */; };
D703D71C2C66E47100A400EA /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D703D71B2C66E47100A400EA /* Media.xcassets */; };
D703D71E2C66E47100A400EA /* ActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D703D71D2C66E47100A400EA /* ActionViewController.swift */; };
@@ -1894,6 +1910,7 @@
/* Begin PBXFileReference section */
0E8A4BB62AE4359200065E81 /* NostrFilter+Hashable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NostrFilter+Hashable.swift"; sourceTree = "<group>"; };
2710433C2E6BFE2A0005C3B0 /* PostingTimelineSwitcherView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostingTimelineSwitcherView.swift; sourceTree = "<group>"; };
3165648A295B70D500C64604 /* LinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkView.swift; sourceTree = "<group>"; };
3169CAE5294E69C000EE4006 /* EmptyTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyTimelineView.swift; sourceTree = "<group>"; };
3169CAEC294FCCFC00EE4006 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Constants.swift; path = damus/Shared/Utilities/Constants.swift; sourceTree = SOURCE_ROOT; };
@@ -2596,6 +2613,11 @@
BA693073295D649800ADDB87 /* UserSettingsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettingsStore.swift; sourceTree = "<group>"; };
BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectWalletView.swift; sourceTree = "<group>"; };
D2277EE92A089BD5006C3807 /* Router.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Router.swift; sourceTree = "<group>"; };
D5C1AFBE2E5DF7E60092F72F /* ContactCardManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactCardManager.swift; sourceTree = "<group>"; };
D5C1AFC32E5DFF700092F72F /* ContactCardManagerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactCardManagerMock.swift; sourceTree = "<group>"; };
D5C1AFC72E5E00690092F72F /* ContactCardManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactCardManagerTests.swift; sourceTree = "<group>"; };
D5C1AFC92E5EE12B0092F72F /* ContactCardNotify.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactCardNotify.swift; sourceTree = "<group>"; };
D5C1AFD12E5EE2820092F72F /* FavoriteButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoriteButtonView.swift; sourceTree = "<group>"; };
D703D7172C66E47100A400EA /* HighlighterActionExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = HighlighterActionExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
D703D7182C66E47100A400EA /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; };
D703D71B2C66E47100A400EA /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
@@ -3229,6 +3251,7 @@
4CA3529C2A76AE47003BB08B /* Notify */ = {
isa = PBXGroup;
children = (
D5C1AFC92E5EE12B0092F72F /* ContactCardNotify.swift */,
D706C5B62D602A050027C627 /* QueueableNotify.swift */,
D7EB00AF2CD59C8300660C07 /* PresentFullScreenItemNotify.swift */,
4C86F7C52A76C51100EC0817 /* AttachedWalletNotify.swift */,
@@ -4010,6 +4033,7 @@
5C78A7792E22FDFE00CF177D /* Features */ = {
isa = PBXGroup;
children = (
D5C1AFC22E5DFF040092F72F /* ContactCard */,
5C78A7BC2E304D7400CF177D /* Translations */,
5C78A7B52E3046F400CF177D /* NIP05 */,
5C78A7AA2E30428D00CF177D /* Actions */,
@@ -4559,6 +4583,7 @@
5C78A7A92E30419B00CF177D /* Views */ = {
isa = PBXGroup;
children = (
2710433C2E6BFE2A0005C3B0 /* PostingTimelineSwitcherView.swift */,
4CE0E2B529A3ED5500DB4CA2 /* InnerTimelineView.swift */,
5C8711DD2C460C06007879C2 /* PostingTimelineView.swift */,
4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */,
@@ -4876,6 +4901,24 @@
path = Camera;
sourceTree = "<group>";
};
D5C1AFC22E5DFF040092F72F /* ContactCard */ = {
isa = PBXGroup;
children = (
D5C1AFD22E5EE2820092F72F /* Views */,
D5C1AFBE2E5DF7E60092F72F /* ContactCardManager.swift */,
D5C1AFC32E5DFF700092F72F /* ContactCardManagerMock.swift */,
);
path = ContactCard;
sourceTree = "<group>";
};
D5C1AFD22E5EE2820092F72F /* Views */ = {
isa = PBXGroup;
children = (
D5C1AFD12E5EE2820092F72F /* FavoriteButtonView.swift */,
);
path = Views;
sourceTree = "<group>";
};
D703D71A2C66E47100A400EA /* highlighter action extension */ = {
isa = PBXGroup;
children = (
@@ -5065,6 +5108,7 @@
F944F56C29EA9CB20067B3BF /* Models */ = {
isa = PBXGroup;
children = (
D5C1AFC72E5E00690092F72F /* ContactCardManagerTests.swift */,
F944F56D29EA9CCC0067B3BF /* DamusParseContentTests.swift */,
75AD872A2AA23A460085EF2C /* Block+Tests.swift */,
B5A75C292B546D94007AFBC0 /* MuteItemTests.swift */,
@@ -5476,6 +5520,7 @@
D798D22C2B086C7400234419 /* NostrEvent+.swift in Sources */,
4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
F757933A29D7AECD007DEAC1 /* MediaPicker.swift in Sources */,
D5C1AFBF2E5DF7E60092F72F /* ContactCardManager.swift in Sources */,
4CC6AA752CAB688500989CEF /* str.c in Sources */,
4CC6AA762CAB688500989CEF /* tal.c in Sources */,
4CC6AA782CAB688500989CEF /* mem.c in Sources */,
@@ -5492,6 +5537,7 @@
D7DB930B2D69486700DA1EE5 /* NIP65.swift in Sources */,
4CB8838D296F710400DC99E7 /* Reposted.swift in Sources */,
4CE6DEE927F7A08100C66700 /* ContentView.swift in Sources */,
2710433D2E6BFE340005C3B0 /* PostingTimelineSwitcherView.swift in Sources */,
4CEE2AF5280B29E600AB5EEF /* TimeAgo.swift in Sources */,
4CC14FF12A73FCDB007AEB17 /* Pubkey.swift in Sources */,
5C8711DE2C460C06007879C2 /* PostingTimelineView.swift in Sources */,
@@ -5569,6 +5615,7 @@
4C285C8E28399BFE008A31F1 /* SaveKeysView.swift in Sources */,
F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */,
4C8D00CA29DF80350036AF10 /* TruncatedText.swift in Sources */,
D5C1AFC62E5DFF700092F72F /* ContactCardManagerMock.swift in Sources */,
4C4DD3DB2A6CA7E8005B4E85 /* ContentParsing.swift in Sources */,
F71694F22A67314D001F4053 /* SuggestedUserView.swift in Sources */,
4C9BB83429C12D9900FC4E37 /* EventProfileName.swift in Sources */,
@@ -5871,6 +5918,8 @@
D76BE18D2E0CF3DA004AD0C6 /* Interests.swift in Sources */,
4C9BB83129C0ED4F00FC4E37 /* DisplayName.swift in Sources */,
7CFF6317299FEFE5005D382A /* SelectableText.swift in Sources */,
D5C1AFD42E5EE2820092F72F /* FavoriteButtonView.swift in Sources */,
D5C1AFCA2E5EE12B0092F72F /* ContactCardNotify.swift in Sources */,
4CA352A82A76B37E003BB08B /* NewMutesNotify.swift in Sources */,
4CFF8F6929CC9ED1008DB934 /* ImageContainerView.swift in Sources */,
7527271E2A93FF0100214108 /* Block.swift in Sources */,
@@ -5994,6 +6043,7 @@
4CB883AA297612FF00DC99E7 /* ZapTests.swift in Sources */,
D72A2D022AD9C136002AFF62 /* EventViewTests.swift in Sources */,
4CB8839A297322D200DC99E7 /* DMTests.swift in Sources */,
D5C1AFC82E5E00690092F72F /* ContactCardManagerTests.swift in Sources */,
D7315A2C2ACDF4DA0036E30A /* DamusCacheManagerTests.swift in Sources */,
4C9054852A6AEAA000811EEC /* NdbTests.swift in Sources */,
75AD872B2AA23A460085EF2C /* Block+Tests.swift in Sources */,
@@ -6091,6 +6141,7 @@
82D6FACA2CD99F7900C925F4 /* NostrScript.swift in Sources */,
82D6FACB2CD99F7900C925F4 /* nostrscript.c in Sources */,
D73C7EDA2DE51690001F9392 /* OnboardingSuggestionsView.swift in Sources */,
D5C1AFC52E5DFF700092F72F /* ContactCardManagerMock.swift in Sources */,
82D6FADE2CD99F7900C925F4 /* ThreadReply.swift in Sources */,
82D6FADF2CD99F7900C925F4 /* AttachedWalletNotify.swift in Sources */,
82D6FAE02CD99F7900C925F4 /* DisplayTabBarNotify.swift in Sources */,
@@ -6151,6 +6202,7 @@
D7DB93052D66A44100DA1EE5 /* Undistractor.swift in Sources */,
82D6FB0C2CD99F7900C925F4 /* GoldSupportGradient.swift in Sources */,
82D6FB0D2CD99F7900C925F4 /* PinkGradient.swift in Sources */,
D5C1AFD32E5EE2820092F72F /* FavoriteButtonView.swift in Sources */,
82D6FB0E2CD99F7900C925F4 /* GrayGradient.swift in Sources */,
82D6FB0F2CD99F7900C925F4 /* DamusLogoGradient.swift in Sources */,
82D6FB102CD99F7900C925F4 /* DamusBackground.swift in Sources */,
@@ -6293,6 +6345,7 @@
82D6FB912CD99F7900C925F4 /* UserSettingsStore.swift in Sources */,
82D6FB922CD99F7900C925F4 /* Wallet.swift in Sources */,
82D6FB932CD99F7900C925F4 /* Report.swift in Sources */,
2710433F2E6BFE340005C3B0 /* PostingTimelineSwitcherView.swift in Sources */,
82D6FB942CD99F7900C925F4 /* LibreTranslateServer.swift in Sources */,
D74EA08E2D2E271E002290DD /* ErrorView.swift in Sources */,
82D6FB952CD99F7900C925F4 /* TranslationService.swift in Sources */,
@@ -6466,6 +6519,7 @@
82D6FC312CD99F7900C925F4 /* ProxyView.swift in Sources */,
82D6FC322CD99F7900C925F4 /* SelectedEventView.swift in Sources */,
82D6FC332CD99F7900C925F4 /* EventBody.swift in Sources */,
D5C1AFC02E5DF7E60092F72F /* ContactCardManager.swift in Sources */,
82D6FC342CD99F7900C925F4 /* BuilderEventView.swift in Sources */,
82D6FC352CD99F7900C925F4 /* EventProfile.swift in Sources */,
82D6FC362CD99F7900C925F4 /* EventMenu.swift in Sources */,
@@ -6541,6 +6595,7 @@
82D6FC772CD99F7900C925F4 /* SuggestedHashtagsView.swift in Sources */,
82D6FC782CD99F7900C925F4 /* ProfileActionSheetView.swift in Sources */,
82D6FC792CD99F7900C925F4 /* damusApp.swift in Sources */,
D5C1AFCC2E5EE12B0092F72F /* ContactCardNotify.swift in Sources */,
82D6FC7A2CD99F7900C925F4 /* ContentView.swift in Sources */,
82D6FC7B2CD99F7900C925F4 /* TestData.swift in Sources */,
82D6FC7C2CD99F7900C925F4 /* ContentParsing.swift in Sources */,
@@ -6565,6 +6620,7 @@
4C3624732D5EA1BE00DD066E /* nostrdb.c in Sources */,
4C3624602D5E9EB800DD066E /* NdbProfile.swift in Sources */,
4C36245F2D5E9B5F00DD066E /* NdbBlock.swift in Sources */,
D5C1AFD52E5EE2820092F72F /* FavoriteButtonView.swift in Sources */,
D73E5E202C6A97F4007EB227 /* AttachedWalletNotify.swift in Sources */,
D73E5E212C6A97F4007EB227 /* DisplayTabBarNotify.swift in Sources */,
D73E5E222C6A97F4007EB227 /* BroadcastNotify.swift in Sources */,
@@ -6626,6 +6682,7 @@
D73E5E582C6A97F4007EB227 /* ThiccDivider.swift in Sources */,
D73E5E592C6A97F4007EB227 /* IconLabel.swift in Sources */,
D73E5E5A2C6A97F4007EB227 /* TruncatedText.swift in Sources */,
D5C1AFC42E5DFF700092F72F /* ContactCardManagerMock.swift in Sources */,
D73E5E5B2C6A97F4007EB227 /* SupporterBadge.swift in Sources */,
D73E5E5C2C6A97F4007EB227 /* GradientButtonStyle.swift in Sources */,
D73E5E5D2C6A97F4007EB227 /* NeutralButtonStyle.swift in Sources */,
@@ -6756,6 +6813,7 @@
D73E5EB92C6A97F4007EB227 /* RelayLog.swift in Sources */,
D73E5EBA2C6A97F4007EB227 /* NostrFilter.swift in Sources */,
D73E5EBB2C6A97F4007EB227 /* Nip98HTTPAuth.swift in Sources */,
D5C1AFCB2E5EE12B0092F72F /* ContactCardNotify.swift in Sources */,
3A92C0FF2DE16E9800CEEBAC /* FaviconCache.swift in Sources */,
D73E5EBC2C6A97F4007EB227 /* Relay.swift in Sources */,
D73E5EBD2C6A97F4007EB227 /* NostrRequest.swift in Sources */,
@@ -6814,6 +6872,7 @@
D73E5EF62C6A97F4007EB227 /* SearchingEventView.swift in Sources */,
D73E5EF72C6A97F4007EB227 /* PullDownSearch.swift in Sources */,
D73E5EF82C6A97F4007EB227 /* NotificationsView.swift in Sources */,
D5C1AFC12E5DF7E60092F72F /* ContactCardManager.swift in Sources */,
D73B74E32D8365BA0067BDBC /* ExtraFonts.swift in Sources */,
D73E5EF92C6A97F4007EB227 /* EventGroupView.swift in Sources */,
D73E5EFA2C6A97F4007EB227 /* NotificationItemView.swift in Sources */,
@@ -7016,6 +7075,7 @@
D703D7A42C670E3C00A400EA /* midl.c in Sources */,
D7DB1FE02D5A78CE00CF06DA /* NIP44.swift in Sources */,
D706C5B02D5D31C20027C627 /* AutoSaveIndicatorView.swift in Sources */,
2710433E2E6BFE340005C3B0 /* PostingTimelineSwitcherView.swift in Sources */,
D703D78B2C670C9500A400EA /* MakeZapRequest.swift in Sources */,
D703D7862C670C6500A400EA /* NewUnmutesNotify.swift in Sources */,
D703D7662C670AFC00A400EA /* AsciiCharacter.swift in Sources */,