Merge branch 'main' into feature/lists-ui

# Conflicts: # CHANGELOG.md
planetary-social · Jan 3, 2025 · d8ea02a · d8ea02a
2 parents f69d4aa + bd30f9b
commit d8ea02a
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed display of mastodon usernames so it shows @username@server.instance rather than [email protected]
 - Nos now publishes the hashtags it finds in your note when you post. This means it works the way you’ve always expected it to work. [#44](https://github.com/verse-pbc/issues/issues/44)
 - Fixed crash related to tracking delete events. [#96](https://github.com/verse-pbc/issues/issues/96)
+- Updated the default relays that are added when you create an account. [#17](https://github.com/verse-pbc/issues/issues/17)
 - Added feed picker view (UI only). [#103](https://github.com/verse-pbc/issues/issues/103)
 - Added feed source customizer drop-down view. [#102](https://github.com/verse-pbc/issues/issues/102)
 - Make feed source selector work.
@@ -29,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgraded to Xcode 16. [#1570](https://github.com/planetary-social/nos/issues/1570)
 - Download and parse an author’s lists when viewing their profile. [#49](https://github.com/verse-pbc/issues/issues/49)
 - Updated fastlane scripts to fix the TestFlight deployment pipeline. [#97](https://github.com/verse-pbc/issues/issues/97)
+- Removed inactive accounts from Discover tab. [#94](https://github.com/verse-pbc/issues/issues/94)
 
 ## [1.0.3] - 2024-12-04Z
 

diff --git a/Nos/Models/CoreData/Relay+CoreDataClass.swift b/Nos/Models/CoreData/Relay+CoreDataClass.swift
@@ -13,9 +13,7 @@ public class Relay: NosManagedObject {
     static var recommended: [String] {
         [
         nosAddress.absoluteString,
-        "wss://relay.damus.io",
-        "wss://purplepag.es",
-        "wss://nos.lol",
+        "wss://news.nos.social",
         "wss://relay.mostr.pub",
         ]
     }

diff --git a/Nos/Views/Discover/DiscoverTab.swift b/Nos/Views/Discover/DiscoverTab.swift
@@ -19,7 +19,6 @@ struct DiscoverTab: View {
 
     @State private var searchController = SearchController()
 
-    @State var predicate: NSPredicate = .false
     @FocusState private var isSearching: Bool
 
     let goToFeedTip = GoToFeedTip()

diff --git a/Nos/Views/Discover/FeaturedAuthor+Cohort1.swift b/Nos/Views/Discover/FeaturedAuthor+Cohort1.swift
@@ -27,11 +27,6 @@ extension FeaturedAuthor {
             npub: "npub1l3y60kjywvrrln5ftse553h2ltg53sm3zy55grvlncd78x3k5uqsmw8dff",
             categories: [.music]
         ),
-        FeaturedAuthor(
-            name: "Judson McKinney and the Wanderers",
-            npub: "npub1jvt2hacqqzvwjkum30mlvmy52jer4p4crfh0veqstpk58rr9e7ms2fwh74",
-            categories: [.music]
-        ),
         FeaturedAuthor(
             name: "Black in Aquatics",
             npub: "npub1ee852umhw26afdfwgf90cky9ufaythwyarttqu59lazcrx56z0tsmx3mkz",

diff --git a/Nos/Views/Discover/FeaturedAuthor+Cohort4.swift b/Nos/Views/Discover/FeaturedAuthor+Cohort4.swift
@@ -12,11 +12,6 @@ extension FeaturedAuthor {
             npub: "npub1qhjxfxpjm7udr0agr6nuhuwf9383e4g9907g64r9hf6y4fh6t6uqpcp36k",
             categories: [.art]
         ),
-        FeaturedAuthor(
-            name: "Neigsendoig Cocules",
-            npub: "npub1372csjhjv35sxcqm90ca2d0cfxsl6xku7j6hhswynwdy9m7zl98scn950w",
-            categories: [.music]
-        ),
         FeaturedAuthor(
             name: "Lexie Bean",
             npub: "npub1s8c5mk68qn0erxrx5waqz7xxk39x5xx2367879eqcv270tqs4tvsf5ewgf",

diff --git a/Nos/Views/Discover/FeaturedAuthor+Cohort5.swift b/Nos/Views/Discover/FeaturedAuthor+Cohort5.swift
@@ -117,11 +117,6 @@ extension FeaturedAuthor {
             npub: "npub18wn0jd3p7n6u3y7mc46p0hpx3cmtv9k3mu82rc0lhkg3rdyf590s3wshpx",
             categories: [.tech, .activists]
         ),
-        FeaturedAuthor(
-            name: "Strypey",
-            npub: "npub1pwwm8s9zxssfm3aqv3g4fvqfh9kglr76m5z434cymju9gp9jhwwqdqtc65",
-            categories: [.tech, .activists]
-        ),
         FeaturedAuthor(
             name: "Cecilia",
             npub: "npub1paftqx5zvj0gjtu3whudejxdgv4vdn27paw4lzaauc43kgfxxaqs75c5a7",
@@ -217,11 +212,6 @@ extension FeaturedAuthor {
             npub: "npub1l4s4mtt96znwu3plfeyupk37y63xfapw5e7kjn7uavuw02lvav5q3ngc3s",
             categories: [.news, .nzAustralia]
         ),
-        FeaturedAuthor(
-            name: "Ian Griffin",
-            npub: "npub19p6edn6lvz9dmegm7s8vyz9w5w0ejzgztke8rcswxgmqr35h8feszt36jc",
-            categories: [.sciFi, .nzAustralia]
-        ),
         FeaturedAuthor(
             name: "JSM",
             npub: "npub1uqeexjx2djkfwzxdnrnrrch5h2k4xn0uapcgsxm94ftaxrlhy5lqywjckg",
@@ -266,11 +256,6 @@ extension FeaturedAuthor {
             name: "Nacho",
             npub: "npub1daajnadf0f0s7uz3yftur8434rtz2s949gkdpx7uyeapm9rlt0qq9q8w5z",
             categories: [.lifestyle]
-        ),
-        FeaturedAuthor(
-            name: "Morvin",
-            npub: "npub1030nmrre84tzpq2de535pd6up2x74c32n6r5xsw2kf0zf58j333sxssyu7",
-            categories: [.art]
         )
     ]
 }
diff --git a/Nos/Views/Discover/FeaturedAuthor.swift b/Nos/Views/Discover/FeaturedAuthor.swift
@@ -41,11 +41,6 @@ extension FeaturedAuthor {
             name: "Rabble",
             npub: "npub1wmr34t36fy03m8hvgl96zl3znndyzyaqhwmwdtshwmtkg03fetaqhjg240",
             categories: [.activists, .tech]
-        ),
-        FeaturedAuthor(
-            name: "Edward Snowden",
-            npub: "npub1sn0wdenkukak0d9dfczzeacvhkrgz92ak56egt7vdgzn8pv2wfqqhrjdv9",
-            categories: [.activists, .tech]
         )
     ]
 }
@@ -107,16 +102,6 @@ extension FeaturedAuthor {
             npub: "npub1l4s4mtt96znwu3plfeyupk37y63xfapw5e7kjn7uavuw02lvav5q3ngc3s",
             categories: [.news, .nzAustralia]
         ),
-        FeaturedAuthor(
-            name: "Ian Griffin",
-            npub: "npub19p6edn6lvz9dmegm7s8vyz9w5w0ejzgztke8rcswxgmqr35h8feszt36jc",
-            categories: [.sciFi, .nzAustralia]
-        ),
-        FeaturedAuthor(
-            name: "Morvin",
-            npub: "npub1030nmrre84tzpq2de535pd6up2x74c32n6r5xsw2kf0zf58j333sxssyu7",
-            categories: [.art]
-        ),
         FeaturedAuthor(
             name: "David Hood",
             npub: "npub12aew64q5lsxpcc98lskha0564gtjn30cw7vdueqnyj06xjqxtmksahdrlg",