Revert "Merge pull request #877 from planetary-social/fix-feed-restore"

This reverts commit 18b742d, reversing
changes made to e34cb00.

CHANGELOG.md

@@ -10,7 +10,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Show the underlying SSB message for posts, replies and likes. #662
 - Fixed an issue where drafts might not be cleared after posting. #868
-- Fixed go-ssb not falling back to legacy replication when a peer does not support EBTs. #877
 - Optimized the "Patchwork" home feed algorithm (RecentlyActivePostsAndContactsAlgorithm) and made it the new default. This algorithm brings posts back up to the top of your home feed when they receive a new reply. #860
 - Optimize loading of follow message cells. #859
 

Frameworks/GoSSB.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libssb-go.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libssb-go.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

GoSSB/Sources/go.mod

@@ -66,6 +66,6 @@ go 1.17
 
 replace golang.org/x/crypto => github.com/cryptix/golang_x_crypto v0.0.0-20200303113948-2939d6771b24
 
-replace go.cryptoscope.co/ssb => github.com/planetary-social/ssb v0.2.2-0.20220929194333-e991d0f744c1
+replace go.cryptoscope.co/ssb => github.com/planetary-social/ssb v0.2.2-0.20220907154211-c7dc092193fc
 
 replace go.mindeco.de => github.com/planetary-social/go-toolbelt v0.0.0-20220509144343-0f7ad206c2b7

GoSSB/Sources/go.sum

@@ -295,8 +295,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/planetary-social/go-toolbelt v0.0.0-20220509144343-0f7ad206c2b7 h1:1S33MMjKxP3XvQATW0N28OnY3Y02L5/21lrx1pwdc0Q=
 github.com/planetary-social/go-toolbelt v0.0.0-20220509144343-0f7ad206c2b7/go.mod h1:dZty08izAk/rSX8wSLen4gMR4WDPYmA6vUTE0QtepHA=
-github.com/planetary-social/ssb v0.2.2-0.20220929194333-e991d0f744c1 h1:0FjA3otKzmYvkvjzV4s7zwTCZE/9adtP760NzClZ2Ik=
-github.com/planetary-social/ssb v0.2.2-0.20220929194333-e991d0f744c1/go.mod h1:aVHa4tYy6ucGATXL2YvKGFR7nFrzqKuhFeMyA0XRI0s=
+github.com/planetary-social/ssb v0.2.2-0.20220907154211-c7dc092193fc h1:3vajc04Aji4nlG7It6tZco3aWkuaqimqmoUybKU1nms=
+github.com/planetary-social/ssb v0.2.2-0.20220907154211-c7dc092193fc/go.mod h1:aVHa4tYy6ucGATXL2YvKGFR7nFrzqKuhFeMyA0XRI0s=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=

Source/App/AppConfiguration.swift

@@ -158,18 +158,6 @@ class AppConfiguration: NSObject, NSCoding, Identifiable {
             .appending("/FBTT")
             .appending("/\(networkKey.hexEncodedString())")
     }
-
-    override var description: String {
-        """
-        id: \(id)
-        name: \(name)
-        identity: \(identity)
-        joinedPlanetarySystem: \(joinedPlanetarySystem)
-        numberOfPublishedMessages: \(numberOfPublishedMessages)
-        networkKey: \(String(describing: network?.string))
-        networkHMAC: -omitted-
-        """
-    }
 
     // MARK: Lifecycle
 

Source/Bot/Operations/SendMissionOperation.swift

@@ -89,7 +89,7 @@ class SendMissionOperation: AsynchronousOperation {
 
             // If we don't have enough peers, supplement with the Planetary pubs
             let minPeers = JoinPlanetarySystemOperation.minNumberOfStars
-            if joinedPubs.count < 1 {
+            if joinedPubs.count < minPeers && config.joinedPlanetarySystem {
                 let systemPubs = Set(config.systemPubs).map { $0.address.multiserver }
                 let someSystemPubs = systemPubs.randomSample(UInt(minPeers - joinedPubs.count))
                 joinedPubs += someSystemPubs

Source/Controller/LaunchViewController.swift

@@ -95,7 +95,7 @@ class LaunchViewController: UIViewController {
         // TODO this should be an analytics track()
         // TODO include app installation UUID
         // Analytics.shared.app(launch)
-        Log.info("Launching with configuration:\n\(configuration)")
+        Log.info("Launching with configuration '\(configuration.name)'")
 
         Task {
             login: do {