diff --git a/CHANGELOG.md b/CHANGELOG.md index c0897d2772..1a65812c90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ We define "Noteworthy changes" as 1) user-facing features or bugfixes 2) signifi The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +- Remove topical pubs that are shutting down. See %1ao9SOiYKIOyPaqgWBJXXMngpiDyS/GJVIVkqg0Y1PU=.sha256 + ## [2.1.1] 2023-09-23 - Add timestamps back to message cards diff --git a/Resources/Info.plist b/Resources/Info.plist index 608d4a177f..abe4f194c6 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -68,8 +68,6 @@ This app allows you to select photos to share with friends or use as your profile image. PLAliasServers $(PLANETARY_COMMUNITY_ALIAS_SERVERS) - PLCommunities - $(COMMUNITIES) PLConstellation $(CONSTELLATION) PLDefaultNetworkKey @@ -94,8 +92,6 @@ $(PLANETARY_SYSTEM_PUBS) PLTestAliasServers $(TEST_PLANETARY_COMMUNITY_ALIAS_SERVERS) - PLTestNetworkCommunities - $(TEST_NETWORK_COMMUNITIES) PLTestNetworkPubs $(TEST_NETWORK_PUBS) PLTestingNetworkHMAC diff --git a/Source/App/AppConfiguration.swift b/Source/App/AppConfiguration.swift index 7096d1a0ad..c34af0a090 100644 --- a/Source/App/AppConfiguration.swift +++ b/Source/App/AppConfiguration.swift @@ -132,17 +132,6 @@ class AppConfiguration: NSObject, NSCoding, Identifiable, @unchecked Sendable { } } - var communityPubs: [Star] { - switch ssbNetwork { - case Environment.Networks.mainNet: - return Environment.PlanetarySystem.communityPubs - case Environment.Networks.test: - return Environment.TestNetwork.communityPubs - default: - return [] - } - } - var communityAliasServers: [Room] { switch ssbNetwork { case Environment.Networks.mainNet: diff --git a/Source/Bot/Operations/JoinPlanetarySystemOperation.swift b/Source/Bot/Operations/JoinPlanetarySystemOperation.swift index aa1206ce26..8e46e908a0 100644 --- a/Source/Bot/Operations/JoinPlanetarySystemOperation.swift +++ b/Source/Bot/Operations/JoinPlanetarySystemOperation.swift @@ -18,7 +18,7 @@ class JoinPlanetarySystemOperation: AsynchronousOperation { private var internalQueue: OperationQueue /// Minimum number of Planetary's pubs that should be followng the user for them to be considered in the system. - static let minNumberOfStars = 3 + static let minNumberOfStars = 2 let userDefaults = UserDefaults.standard diff --git a/Source/Configs/Environment.swift b/Source/Configs/Environment.swift index f693bd3766..37c466179b 100644 --- a/Source/Configs/Environment.swift +++ b/Source/Configs/Environment.swift @@ -32,10 +32,6 @@ struct Environment { Environment.value(for: "PLPlanetarySystem").split(separator: " ").map { Star(invite: String($0)) } }() - static let communityPubs: [Star] = { - Environment.value(for: "PLCommunities").split(separator: " ").map { Star(invite: String($0)) } - }() - static let planetaryIdentity: Identity = { Environment.value(for: "PLPlanetaryIdentity") }() @@ -49,10 +45,6 @@ struct Environment { Environment.value(for: "PLTestNetworkPubs").split(separator: " ").map { Star(invite: String($0)) } }() - static let communityPubs: [Star] = { - Environment.value(for: "PLTestNetworkCommunities").split(separator: " ").map { Star(invite: String($0)) } - }() - static let communityAliasServers: [Room] = { parseCommunityServers(environmentKey: "PLTestAliasServers") }() diff --git a/Source/Configs/Planetary.debug.xcconfig b/Source/Configs/Planetary.debug.xcconfig index 412881550f..820c3f49d1 100644 --- a/Source/Configs/Planetary.debug.xcconfig +++ b/Source/Configs/Planetary.debug.xcconfig @@ -19,37 +19,14 @@ SWIFT_OBJC_BRIDGING_HEADER = ${PROJECT_DIR}/Source/GoBot/GoBotBridge.h // If you change any invitations here you should track them here too: https://github.com/planetary-social/infrastructure/wiki/Pub-Invitation-Tracking -PUB_ONE = one.planetary.pub:8008:@CIlwTOK+m6v1hT2zUVOCJvvZq7KE/65ErN6yA2yrURY=.ed25519~3Ht0U0ZcO7UaiVann2wPTOr3rDM3GjmTyswjx7Mh5K4= -PUB_TWO = two.planetary.pub:8008:@7jJ7oou5pKKuyKvIlI5tl3ncjEXmZcbm3TvKqQetJIo=.ed25519~l7SxAVayKsu96TzNCDIkOWMiUA1LDGtSV06vfq93FmY= -PUB_THREE = three.planetary.pub:8008:@LQ8HBiEinU5FiXGaZH9JYFGBGdsB99mepBdh/Smq3VI=.ed25519~3BmUblybJ1RDWErRZAv/dHSKLd2Hx+H8xCWD9+TDwjQ= -PUB_FOUR = four.planetary.pub:8008:@5KDK98cjIQ8bPoBkvp7bCwBXoQMlWpdIbCFyXER8Lbw=.ed25519~e9ZRXEw0RSTE6FX8jOwWV7yfMRDsAZkzlhCRbVMBUEc= +PUB_ONE = one.planetary.pub:8008:@CIlwTOK+m6v1hT2zUVOCJvvZq7KE/65ErN6yA2yrURY=.ed25519~gkPjmojoEv5xNRcCl/BzF1reod2pnh+ciS1E+Tr6XOc= +PUB_TWO = two.planetary.pub:8008:@7jJ7oou5pKKuyKvIlI5tl3ncjEXmZcbm3TvKqQetJIo=.ed25519~hLsEIUnGlGhZ02p946sdGA5DkeGLYZU67Of4kFtrEdc= PLANETARY_SYSTEM_PUBS = ${PUB_ONE} ${PUB_TWO} ${PUB_THREE} // ${PUB_FOUR} - disabled due to being down - nov 5th 2022 - rabble TEST_PUB_ONE = dev.planetary.pub:8008:@IzuvGuH1r29Gjg4aBq+C0ke1b5t+Tk9tmSZfZIB9XFE=.ed25519~C7roPCA8eU59HvstGS/sGV06cGUYD26Tm/J8jtUo2jw= -TEST_PUB_TWO = 167.99.36.26:8008:@zOTzL5j6Ox4pFhyj01eVoD3phCvnPJQNixtC3XbDniE=.ed25519~WVAtPG3sk8tbKKxd0k8RYjaKVKnJeLefNjBALvoCrGo= TEST_NETWORK_PUBS = ${TEST_PUB_ONE} -TEST_NETWORK_COMMUNITIES = ${TEST_PUB_TWO} - -CRYPTO = crypto.planetary.pub:8008:@CBaNGA3MPZHPKo4gvrZsTCCV3DUgydmPnwK0UDRRbqQ=.ed25519~yrRA7UQNPJfFP5/cyo3kmFidfAWX6SEa8Rq4DHqsfNo= -FLOSS = floss.planetary.pub:8008:@uHqyTLo/JwapDh+ryXKe0VyBMS7eqt0YEKwvUathiS8=.ed25519~vr3cPOGE5DgCCsxlinLRlFK6E6D0pWVWHv0DpEY314A= -FREESOCIAL = pub.freesocial.co:8008:@ofYKOy2p9wsaxV73GqgOyh6C6nRGFM5FyciQyxwBd6A=.ed25519~ye9Z808S3KPQsV0MWr1HL0/Sh8boSEwW+ZK+8x85u9w= -SCUTTLEUS = scuttle.us:8008:@WqcuCOIpLtXFRw/9vOAQJti8avTZ9vxT9rKrPo8qG6o=.ed25519~/ZUi9Chpl0g1kuWSrmehq2EwMQeV0Pd+8xw8XhWuhLE= -PORRO = porro.club:8008:@qAFzUyH1dISX93LnQTllaAtudH79i/ht0crIUgAKTm8=.ed25519~0xqpvDaEWFjHKMjUsGRGgWMjeGBSYYYPXqX0nVyi1Hc= -GARDENING = gardening.planetary.pub:8008:@1ZA2K/bPs41o4EJ1gAVVNGGj0WAB6laJC2AOJbdBrmM=.ed25519~YXJJxmyAxsAnUyn1b5CWURNkIg/T/kQlgN+eYq4EjJE= -POETRY = poetry.planetary.pub:8008:@FBH3fASAJ3aJtzHL7nDg86HiuCjAKSljzXAIhlZqnFw=.ed25519~wu3Fahw7RcC++h/IGFncltVLwanontMtObeRB8EBSFQ= -FUNGI = fungi.planetary.pub:8008:@ULtTfklxd39BtkQs97OwKRm1vncQHc/foySwTPErkwg=.ed25519~Z+Qguco1LSgWACi+zcaJFmS9Ek06dqPOFa473c+a+hU= -COOKING = cooking.planetary.pub:8008:@8oxL9ddFp+y+EJx4HfYsnHKUUlscH0bgng4QJn1g5dQ=.ed25519~GeGYfdnNBBxT4785EiuHITVIA5SyQyge3hlNtF79ZcM= -QUEER = queer.family:8008:@nnAMmrhLfy54wkYSgAZWK4fBg/b/83YjilPk5JfNzXM=.ed25519~kxCY33m5QNMnLbJ0pkHHUaWdRyANTlS4gaISXN2D3x0= - -ESPANOL = espanol.planetary.pub:8008:@KpZ49dSM+wr73t8peJQWBLjAlENLG9yLdVBNv7PgatI=.ed25519~s7GLx7uJSllwh4HVB0v7DOY4f9YO1kPw7RvjGDnXe7I= -RUSSIAN = russian-language.planetary.pub:8008:@EmJzXv/EZrAuGS1UNpH07AVz908sGckRaX38BxVgA+0=.ed25519~Sq5cxugjyL3r2VdV2uoT4nG6fqMiws5f9xivqu12oQI= -UKRAINIAN = ukrainian-language.planetary.pub:8008:@pDcdMNVFSDW43XAcsU4WHumId54h4mQi5y8z9FDGyqM=.ed25519~y9Ac9XkzNBHkwaIwxQijXxchVj4QgmPm8VKLBP+2Dag= -FRENCH = francaise.planetary.pub:8008:@yzbJcRdC7BGLumJohjlySD7zwgVgR8udpFzAUK5/ptw=.ed25519~i34wbWgr+bsIdf0uLTABxekybDJEZu8EBPEg9FrN90w= -CHINESE = chinese-language.planetary.pub:8008:@L1LEmI49J3lzKUy6XPkh9/6ci+Cc8JlUIGg8inzWaVo=.ed25519~LMWjK1qWd0MryvrkrMhSY746OuhRMf94tzQuZ+HdVQk= - -COMMUNITIES = ${CRYPTO} ${FLOSS} ${FREESOCIAL} ${SCUTTLEUS} ${PORRO} ${GARDENING} ${POETRY} ${FUNGI} ${COOKING} ${QUEER} ${ESPANOL} ${RUSSIAN} ${UKRAINIAN} ${CHINESE} ${FRENCH} PLANETARY = @l1sGqWeCZRA99gN+t9sI6+UOzGcHq3KhLQUYEwb4DCo=.ed25519 PLANETARY_SYSTEM = ${PLANETARY} diff --git a/Source/Configs/Planetary.release.xcconfig b/Source/Configs/Planetary.release.xcconfig index 658ed6c391..95eed57cc4 100644 --- a/Source/Configs/Planetary.release.xcconfig +++ b/Source/Configs/Planetary.release.xcconfig @@ -19,44 +19,20 @@ SWIFT_OBJC_BRIDGING_HEADER = ${PROJECT_DIR}/Source/GoBot/GoBotBridge.h // If you change any invitations here you should track them here too: https://github.com/planetary-social/infrastructure/wiki/Pub-Invitation-Tracking -PUB_ONE = one.planetary.pub:8008:@CIlwTOK+m6v1hT2zUVOCJvvZq7KE/65ErN6yA2yrURY=.ed25519~3Ht0U0ZcO7UaiVann2wPTOr3rDM3GjmTyswjx7Mh5K4= -PUB_TWO = two.planetary.pub:8008:@7jJ7oou5pKKuyKvIlI5tl3ncjEXmZcbm3TvKqQetJIo=.ed25519~l7SxAVayKsu96TzNCDIkOWMiUA1LDGtSV06vfq93FmY= -PUB_THREE = three.planetary.pub:8008:@LQ8HBiEinU5FiXGaZH9JYFGBGdsB99mepBdh/Smq3VI=.ed25519~3BmUblybJ1RDWErRZAv/dHSKLd2Hx+H8xCWD9+TDwjQ= -PUB_FOUR = four.planetary.pub:8008:@5KDK98cjIQ8bPoBkvp7bCwBXoQMlWpdIbCFyXER8Lbw=.ed25519~e9ZRXEw0RSTE6FX8jOwWV7yfMRDsAZkzlhCRbVMBUEc= +PUB_ONE = one.planetary.pub:8008:@CIlwTOK+m6v1hT2zUVOCJvvZq7KE/65ErN6yA2yrURY=.ed25519~gkPjmojoEv5xNRcCl/BzF1reod2pnh+ciS1E+Tr6XOc= +PUB_TWO = two.planetary.pub:8008:@7jJ7oou5pKKuyKvIlI5tl3ncjEXmZcbm3TvKqQetJIo=.ed25519~hLsEIUnGlGhZ02p946sdGA5DkeGLYZU67Of4kFtrEdc= PLANETARY_SYSTEM_PUBS = ${PUB_ONE} ${PUB_TWO} ${PUB_THREE} // ${PUB_FOUR} - disabled due to being down - nov 5th 2022 - rabble TEST_PUB_ONE = dev.planetary.pub:8008:@IzuvGuH1r29Gjg4aBq+C0ke1b5t+Tk9tmSZfZIB9XFE=.ed25519~C7roPCA8eU59HvstGS/sGV06cGUYD26Tm/J8jtUo2jw= -TEST_PUB_TWO = 167.99.36.26:8008:@zOTzL5j6Ox4pFhyj01eVoD3phCvnPJQNixtC3XbDniE=.ed25519~WVAtPG3sk8tbKKxd0k8RYjaKVKnJeLefNjBALvoCrGo= TEST_NETWORK_PUBS = ${TEST_PUB_ONE} -TEST_NETWORK_COMMUNITIES = ${TEST_PUB_TWO} - -CRYPTO = crypto.planetary.pub:8008:@CBaNGA3MPZHPKo4gvrZsTCCV3DUgydmPnwK0UDRRbqQ=.ed25519~yrRA7UQNPJfFP5/cyo3kmFidfAWX6SEa8Rq4DHqsfNo= -FLOSS = floss.planetary.pub:8008:@uHqyTLo/JwapDh+ryXKe0VyBMS7eqt0YEKwvUathiS8=.ed25519~vr3cPOGE5DgCCsxlinLRlFK6E6D0pWVWHv0DpEY314A= -FREESOCIAL = pub.freesocial.co:8008:@ofYKOy2p9wsaxV73GqgOyh6C6nRGFM5FyciQyxwBd6A=.ed25519~ye9Z808S3KPQsV0MWr1HL0/Sh8boSEwW+ZK+8x85u9w= -SCUTTLEUS = scuttle.us:8008:@WqcuCOIpLtXFRw/9vOAQJti8avTZ9vxT9rKrPo8qG6o=.ed25519~/ZUi9Chpl0g1kuWSrmehq2EwMQeV0Pd+8xw8XhWuhLE= -PORRO = porro.club:8008:@qAFzUyH1dISX93LnQTllaAtudH79i/ht0crIUgAKTm8=.ed25519~0xqpvDaEWFjHKMjUsGRGgWMjeGBSYYYPXqX0nVyi1Hc= -GARDENING = gardening.planetary.pub:8008:@1ZA2K/bPs41o4EJ1gAVVNGGj0WAB6laJC2AOJbdBrmM=.ed25519~YXJJxmyAxsAnUyn1b5CWURNkIg/T/kQlgN+eYq4EjJE= -POETRY = poetry.planetary.pub:8008:@FBH3fASAJ3aJtzHL7nDg86HiuCjAKSljzXAIhlZqnFw=.ed25519~wu3Fahw7RcC++h/IGFncltVLwanontMtObeRB8EBSFQ= -FUNGI = fungi.planetary.pub:8008:@ULtTfklxd39BtkQs97OwKRm1vncQHc/foySwTPErkwg=.ed25519~Z+Qguco1LSgWACi+zcaJFmS9Ek06dqPOFa473c+a+hU= -COOKING = cooking.planetary.pub:8008:@8oxL9ddFp+y+EJx4HfYsnHKUUlscH0bgng4QJn1g5dQ=.ed25519~GeGYfdnNBBxT4785EiuHITVIA5SyQyge3hlNtF79ZcM= -QUEER = queer.family:8008:@nnAMmrhLfy54wkYSgAZWK4fBg/b/83YjilPk5JfNzXM=.ed25519~kxCY33m5QNMnLbJ0pkHHUaWdRyANTlS4gaISXN2D3x0= - -ESPANOL = espanol.planetary.pub:8008:@KpZ49dSM+wr73t8peJQWBLjAlENLG9yLdVBNv7PgatI=.ed25519~s7GLx7uJSllwh4HVB0v7DOY4f9YO1kPw7RvjGDnXe7I= -RUSSIAN = russian-language.planetary.pub:8008:@EmJzXv/EZrAuGS1UNpH07AVz908sGckRaX38BxVgA+0=.ed25519~Sq5cxugjyL3r2VdV2uoT4nG6fqMiws5f9xivqu12oQI= -UKRAINIAN = ukrainian-language.planetary.pub:8008:@pDcdMNVFSDW43XAcsU4WHumId54h4mQi5y8z9FDGyqM=.ed25519~y9Ac9XkzNBHkwaIwxQijXxchVj4QgmPm8VKLBP+2Dag= -FRENCH = francaise.planetary.pub:8008:@yzbJcRdC7BGLumJohjlySD7zwgVgR8udpFzAUK5/ptw=.ed25519~i34wbWgr+bsIdf0uLTABxekybDJEZu8EBPEg9FrN90w= -CHINESE = chinese-language.planetary.pub:8008:@L1LEmI49J3lzKUy6XPkh9/6ci+Cc8JlUIGg8inzWaVo=.ed25519~LMWjK1qWd0MryvrkrMhSY746OuhRMf94tzQuZ+HdVQk= - -COMMUNITIES = ${CRYPTO} ${FLOSS} ${FREESOCIAL} ${SCUTTLEUS} ${PORRO} ${GARDENING} ${POETRY} ${FUNGI} ${COOKING} ${QUEER} ${ESPANOL} ${RUSSIAN} ${UKRAINIAN} ${CHINESE} ${FRENCH} - PLANETARY = @l1sGqWeCZRA99gN+t9sI6+UOzGcHq3KhLQUYEwb4DCo=.ed25519 PLANETARY_SYSTEM = ${PLANETARY} ALIAS_SERVER_ONE = Planetary Alias::net:planetary.name:8008~shs:42ACINb4+Qjd1kPYYpJ67V16CTHIWp93cjd1gDX7FKY=::icon-planetary-3::planetaryRoomToken -PLANETARY_COMMUNITY_ALIAS_SERVERS = ${ALIAS_SERVER_ONE}||${ALIAS_SERVER_TWO}||${ALIAS_SERVER_THREE} +PLANETARY_COMMUNITY_ALIAS_SERVERS = ${ALIAS_SERVER_ONE} TEST_ALIAS_SERVER_ONE = Lorentz Test Room::net:test-room.lorentz.is:8008~shs:mxAUHhdpkdu7Lg6uB4T1gWcvAD3ugdhNiUb8K37YEh4=::icon-test-room-lorentz::lorentzRoomToken TEST_PLANETARY_COMMUNITY_ALIAS_SERVERS = ${TEST_ALIAS_SERVER_ONE}|| diff --git a/Source/Configs/UnitTests.debug.xcconfig b/Source/Configs/UnitTests.debug.xcconfig index e4677dc182..d2b5687d98 100644 --- a/Source/Configs/UnitTests.debug.xcconfig +++ b/Source/Configs/UnitTests.debug.xcconfig @@ -19,8 +19,6 @@ CONSTELLATION = PLANETARY_SYSTEM = -COMMUNITIES = - TEST_PUB_ONE = 198.199.90.207:8008:@2xO+nZ1D46RIc6hGKk1fJ4ccynogPNry1S7q18XZQGk=.ed25519~9qgQcC9XngzFLV2A9kIOyVo0q8P+twN6VLKl4DBOgsQ= TEST_NETWORK_PUBS = ${TEST_PUB_ONE} diff --git a/Source/Controller/DirectoryViewController.swift b/Source/Controller/DirectoryViewController.swift index 7e5a61b0f4..8bc07156e2 100644 --- a/Source/Controller/DirectoryViewController.swift +++ b/Source/Controller/DirectoryViewController.swift @@ -46,9 +46,8 @@ class DirectoryViewController: ContentViewController, AboutTableViewDelegate, He } } - private let communityPubs = (AppConfiguration.current?.communityPubs ?? []) + - (AppConfiguration.current?.systemPubs ?? []) - private lazy var communityPubIdentities = Set(communityPubs.map { $0.feed }) + private let pubs = AppConfiguration.current?.systemPubs ?? [] + private lazy var pubIdentities = Set(pubs.map { $0.feed }) /// A post that was loaded when the user put its ID in the search bar. private var searchedPost: Message? @@ -131,7 +130,7 @@ class DirectoryViewController: ContentViewController, AboutTableViewDelegate, He if self.searchFilter.isEmpty { activeSections = Self.defaultSections self.people = allPeople.filter { person in - !self.communityPubIdentities.contains(person.identity) + !self.pubIdentities.contains(person.identity) } } else { let filter = searchFilter.lowercased() @@ -270,7 +269,7 @@ extension DirectoryViewController: UITableViewDataSource { switch section { case .communityPubs: - return searchFilter.isEmpty ? communityPubs.count : 0 + return searchFilter.isEmpty ? pubs.count : 0 case .users: return activeSections.contains(.users) ? 1 : 0 case .posts: @@ -286,7 +285,7 @@ extension DirectoryViewController: UITableViewDataSource { switch section { case .communityPubs: let cell = dequeueExtendedAboutTableViewCell(in: tableView) - let star = communityPubs[indexPath.row] + let star = pubs[indexPath.row] if let about = self.allPeople.first(where: { $0.identity == star.feed }) { cell.aboutView.update(with: star.feed, about: about, star: star) } else { @@ -312,10 +311,10 @@ extension DirectoryViewController: UITableViewDataSource { case .network: // Users in Your Network let about = self.people[indexPath.row] - let isCommunity = communityPubIdentities.contains(about.identity) + let isCommunity = pubIdentities.contains(about.identity) if isCommunity { let cell = dequeueExtendedAboutTableViewCell(in: tableView) - if let star = communityPubs.first(where: { $0.feed == about.identity }) { + if let star = pubs.first(where: { $0.feed == about.identity }) { cell.aboutView.update(with: star.feed, about: about, star: star) } return cell @@ -344,7 +343,7 @@ extension DirectoryViewController: UITableViewDelegate { switch section { case .communityPubs: - let star = communityPubs[indexPath.row] + let star = pubs[indexPath.row] let controller = IdentityViewBuilder.build(identity: star.feed) self.navigationController?.pushViewController(controller, animated: true) case .users: diff --git a/Source/GoBot/FeedStrategy/ProfileStrategy.swift b/Source/GoBot/FeedStrategy/ProfileStrategy.swift index ea06b9d6cf..4d11da3152 100644 --- a/Source/GoBot/FeedStrategy/ProfileStrategy.swift +++ b/Source/GoBot/FeedStrategy/ProfileStrategy.swift @@ -20,8 +20,7 @@ final class ProfileStrategy: NSObject, FeedStrategy { } private var isStar: Bool { - let pubs = (AppConfiguration.current?.communityPubs ?? []) + - (AppConfiguration.current?.systemPubs ?? []) + let pubs = AppConfiguration.current?.systemPubs ?? [] return pubs.contains { $0.feed == identity } } diff --git a/Source/Service/PreloadedPubService.swift b/Source/Service/PreloadedPubService.swift index 0d0ff25a6b..bc2e65a628 100644 --- a/Source/Service/PreloadedPubService.swift +++ b/Source/Service/PreloadedPubService.swift @@ -94,7 +94,7 @@ class PreloadedPubServiceAdapter: PreloadedPubService { Log.info("Dropping pub about messages") - let pubs = appConfig.communityPubs + appConfig.systemPubs + let pubs = appConfig.systemPubs pubs.forEach { do { try goBot.database.deleteAbouts(for: $0.feed) diff --git a/Source/UI/AboutView.swift b/Source/UI/AboutView.swift index 0f7bf48d8d..ff942cc6c7 100644 --- a/Source/UI/AboutView.swift +++ b/Source/UI/AboutView.swift @@ -205,9 +205,8 @@ class AboutView: MessageUIView { loadRelationship(identity: identity) } - let communityPubs = (AppConfiguration.current?.communityPubs ?? []) + - (AppConfiguration.current?.systemPubs ?? []) - if let star = communityPubs.first(where: { $0.feed == identity }) { + let pubs = AppConfiguration.current?.systemPubs ?? [] + if let star = pubs.first(where: { $0.feed == identity }) { followButton.star = star } else { followButton.star = nil diff --git a/Source/UI/Identity/RelationshipButton.swift b/Source/UI/Identity/RelationshipButton.swift index a305d4c35a..bba495c43b 100644 --- a/Source/UI/Identity/RelationshipButton.swift +++ b/Source/UI/Identity/RelationshipButton.swift @@ -111,8 +111,7 @@ struct RelationshipButton: View { } private var star: Star? { - let pubs = (AppConfiguration.current?.communityPubs ?? []) + - (AppConfiguration.current?.systemPubs ?? []) + let pubs = AppConfiguration.current?.systemPubs ?? [] return pubs.first { $0.feed == relationship?.other } } @@ -202,7 +201,7 @@ struct RelationshipButton: View { isToggling = true Task.detached { let bot = await botRepository.current - let pubs = (AppConfiguration.current?.communityPubs ?? []) + (AppConfiguration.current?.systemPubs ?? []) + let pubs = AppConfiguration.current?.systemPubs ?? [] let star = pubs.first { $0.feed == relationshipToUpdate.other } do { if relationshipToUpdate.isBlocking { diff --git a/Source/UI/UniversalSearchResultsView.swift b/Source/UI/UniversalSearchResultsView.swift index 02a09339d1..4b4abf99ee 100644 --- a/Source/UI/UniversalSearchResultsView.swift +++ b/Source/UI/UniversalSearchResultsView.swift @@ -130,9 +130,6 @@ class UniversalSearchResultsView: UIView, UITableViewDelegate, UITableViewDataSo // MARK: - Private Properties - private let communityPubs = AppConfiguration.current?.communityPubs ?? [] - private lazy var communityPubIdentities = Set(communityPubs.map { $0.feed }) - @Published private var searchResults = SearchResultsUI(data: .none, query: "") private var cancellables = [AnyCancellable]() private let searchQueue = DispatchQueue(label: "searchQueue", qos: .userInitiated) @@ -443,28 +440,15 @@ class UniversalSearchResultsView: UIView, UITableViewDelegate, UITableViewDataSo guard let inNetworkPeople = searchResults.inNetworkPeople else { return UITableViewCell() } - let about = inNetworkPeople[indexPath.row] - let isCommunity = communityPubIdentities.contains(about.identity) - if isCommunity { - let cell = ( - tableView.dequeueReusableCell(withIdentifier: CommunityTableViewCell.className) - as? CommunityTableViewCell - ) ?? CommunityTableViewCell() - if let star = communityPubs.first(where: { $0.feed == about.identity }) { - cell.communityView.update(with: star, about: about) - } - return cell - } else { - guard let inNetworkPeople = searchResults.inNetworkPeople else { - return UITableViewCell() - } - let about = inNetworkPeople[indexPath.row] - let cell = ( - tableView.dequeueReusableCell(withIdentifier: AboutTableViewCell.className) as? AboutTableViewCell - ) ?? AboutTableViewCell() - cell.aboutView.update(with: about.identity, about: about) - return cell + guard let inNetworkPeople = searchResults.inNetworkPeople else { + return UITableViewCell() } + let about = inNetworkPeople[indexPath.row] + let cell = ( + tableView.dequeueReusableCell(withIdentifier: AboutTableViewCell.className) as? AboutTableViewCell + ) ?? AboutTableViewCell() + cell.aboutView.update(with: about.identity, about: about) + return cell } } diff --git a/UnitTests/Resources/Info.plist b/UnitTests/Resources/Info.plist index 5622ccde50..46b7196bcf 100644 --- a/UnitTests/Resources/Info.plist +++ b/UnitTests/Resources/Info.plist @@ -22,8 +22,6 @@ $(VERSE_HOST) PLConstellation $(CONSTELLATION) - PLCommunities - $(COMMUNITIES) PLPlanetarySystem $(PLANETARY_SYSTEM_PUBS) PLPlanetaryIdentity @@ -46,8 +44,6 @@ $(TESTING_NETWORK_NAME) PLTestNetworkPubs $(TEST_NETWORK_PUBS) - PLTestNetworkCommunities - $(TEST_NETWORK_COMMUNITIES) PLTestingNetworkKey $(TESTING_NETWORK_KEY) PLTestingNetworkHMAC