Remove the concept of __key__

I don't think this concept is consistent.

It's introduced on FeedSourceInfo which is used both by pinned feeds and by useFeedSourceInfoQuery. Pinned feeds use the pinning ID there. But there is no pinning ID for useFeedSourceInfoQuery. So this means this field is sometimes one thing and sometimes some other thing. That is a decent sign that it shouldn't be on that type at all.

It's not used anywhere except the desktop feed enumeration. It seems reasonable to assume there that we wouldn't want to show the same feed URL twice. (And if it does occur in the array twice, IMO we should solve that at the API level and dedupe it on read or next write.) So I think we should just use the URL in that place. (I used the descriptor, which is equivalent.)

src/state/queries/feed.ts

@@ -22,10 +22,6 @@ import {useAgent, useSession} from '#/state/session'
 import {router} from '#/routes'
 
 export type FeedSourceFeedInfo = {
-  /**
-   * Unique identifier. The URI + `savedFeed.id` if available.
-   */
-  __key__: string
   type: 'feed'
   uri: string
   route: {
@@ -44,10 +40,6 @@ export type FeedSourceFeedInfo = {
 }
 
 export type FeedSourceListInfo = {
-  /**
-   * Unique identifier. The URI + `savedFeed.id` if available.
-   */
-  __key__: string
   type: 'list'
   uri: string
   route: {
@@ -78,7 +70,6 @@ const feedSourceNSIDs = {
 
 export function hydrateFeedGenerator(
   view: AppBskyFeedDefs.GeneratorView,
-  extra?: {__key__: string},
 ): FeedSourceInfo {
   const urip = new AtUri(view.uri)
   const collection =
@@ -87,7 +78,6 @@ export function hydrateFeedGenerator(
   const route = router.matchPath(href)
 
   return {
-    __key__: `feed|${view.uri}|${extra?.__key__ || ''}`,
     type: 'feed',
     uri: view.uri,
     cid: view.cid,
@@ -111,18 +101,14 @@ export function hydrateFeedGenerator(
   }
 }
 
-export function hydrateList(
-  view: AppBskyGraphDefs.ListView,
-  extra?: {__key__: string},
-): FeedSourceInfo {
+export function hydrateList(view: AppBskyGraphDefs.ListView): FeedSourceInfo {
   const urip = new AtUri(view.uri)
   const collection =
     urip.collection === 'app.bsky.feed.generator' ? 'feed' : 'lists'
   const href = `/profile/${urip.hostname}/${collection}/${urip.rkey}`
   const route = router.matchPath(href)
 
   return {
-    __key__: `list|${view.uri}|${extra?.__key__ || ''}`,
     type: 'list',
     uri: view.uri,
     route: {
@@ -221,7 +207,6 @@ export function useSearchPopularFeedsMutation() {
  * The following feed, with fallbacks to Discover
  */
 const PWI_DISCOVER_FEED_STUB: FeedSourceInfo = {
-  __key__: 'pwi',
   type: 'feed',
   displayName: 'Discover',
   uri: DISCOVER_FEED_URI,
@@ -273,9 +258,7 @@ export function usePinnedFeedsInfos() {
               const feedView = res.data.feeds[i]
               resolved.set(
                 feedView.uri + pinnedFeedsIds[i],
-                hydrateFeedGenerator(feedView, {
-                  __key__: pinnedFeedsIds[i],
-                }),
+                hydrateFeedGenerator(feedView),
               )
             }
           })
@@ -290,10 +273,7 @@ export function usePinnedFeedsInfos() {
           })
           .then(res => {
             const listView = res.data.list
-            resolved.set(
-              listView.uri + list.id,
-              hydrateList(listView, {__key__: list.id}),
-            )
+            resolved.set(listView.uri + list.id, hydrateList(listView))
           }),
       )
 
@@ -308,7 +288,6 @@ export function usePinnedFeedsInfos() {
           result.push(feedInfo)
         } else if (pinnedItem.type === 'timeline') {
           result.push({
-            __key__: `feed|${pinnedItem.value}|${pinnedItem.id}`,
             type: 'feed',
             displayName: 'Following',
             uri: pinnedItem.value,

src/view/shell/desktop/Feeds.tsx

@@ -45,7 +45,7 @@ export function DesktopFeeds() {
         }
         return (
           <FeedItem
-            key={feedInfo.__key__}
+            key={feed}
             href={'/?' + new URLSearchParams([['feed', feed]])}
             title={feedInfo.displayName}
             current={route.name === 'Home' && feed === selectedFeed}