diff options
| -rw-r--r-- | src/state/models/feeds/algo/algo-item.ts | 28 | ||||
| -rw-r--r-- | src/state/models/feeds/algo/saved.ts | 18 | ||||
| -rw-r--r-- | src/view/com/algos/AlgoItem.tsx | 15 | ||||
| -rw-r--r-- | src/view/com/pager/FeedsTabBarMobile.tsx | 8 | ||||
| -rw-r--r-- | src/view/screens/CustomFeed.tsx | 6 | ||||
| -rw-r--r-- | src/view/screens/Home.tsx | 2 |
6 files changed, 39 insertions, 38 deletions
diff --git a/src/state/models/feeds/algo/algo-item.ts b/src/state/models/feeds/algo/algo-item.ts index 39bc760ac..8291b6d86 100644 --- a/src/state/models/feeds/algo/algo-item.ts +++ b/src/state/models/feeds/algo/algo-item.ts @@ -67,30 +67,12 @@ export class AlgoItemModel { } } - // public apis - // = - async save() { - try { - this.toggleSaved = true - await this.rootStore.agent.app.bsky.feed.saveFeed({ - feed: this.data.uri, - }) - } catch (e: any) { - this.rootStore.log.error('Failed to save feed', e) - } - } - - async unsave() { - try { - this.toggleSaved = false - await this.rootStore.agent.app.bsky.feed.unsaveFeed({ - feed: this.data.uri, - }) - } catch (e: any) { - this.rootStore.log.error('Failed to unsanve feed', e) - } + private rewriteData(data: AppBskyFeedDefs.GeneratorView) { + this.data = data } + // public apis + // = async like() { try { const res = await this.rootStore.agent.app.bsky.feed.like.create( @@ -151,7 +133,7 @@ export class AlgoItemModel { const res = await this.rootStore.agent.app.bsky.feed.getFeedGenerator({ feed: this.data.uri, }) - this.data = res.data.view + this.rewriteData(res.data.view) } serialize() { diff --git a/src/state/models/feeds/algo/saved.ts b/src/state/models/feeds/algo/saved.ts index 15859fe0c..97d75820d 100644 --- a/src/state/models/feeds/algo/saved.ts +++ b/src/state/models/feeds/algo/saved.ts @@ -71,6 +71,12 @@ export class SavedFeedsModel { ) } + get listOfPinnedFeedNames() { + return this.pinned.map( + f => f.data.displayName ?? f.data.creator.displayName + "'s feed", + ) + } + get savedFeedsWithoutPinned() { return this.feeds.filter( f => !this.pinned.find(p => p.data.uri === f.data.uri), @@ -81,10 +87,14 @@ export class SavedFeedsModel { if (!this.isPinned(feed)) { this.pinned.push(feed) } else { - this.pinned = this.pinned.filter(f => f.data.uri !== feed.data.uri) + this.removePinnedFeed(feed.data.uri) } } + removePinnedFeed(uri: string) { + this.pinned = this.pinned.filter(f => f.data.uri !== uri) + } + reorderPinnedFeeds(temp: AlgoItemModel[]) { this.pinned = temp } @@ -144,18 +154,22 @@ export class SavedFeedsModel { await this.rootStore.agent.app.bsky.feed.saveFeed({ feed: algoItem.getUri, }) + algoItem.toggleSaved = true this.addFeed(algoItem) } catch (e: any) { this.rootStore.log.error('Failed to save feed', e) } } - async unsave(uri: string) { + async unsave(algoItem: AlgoItemModel) { + const uri = algoItem.getUri try { await this.rootStore.agent.app.bsky.feed.unsaveFeed({ feed: uri, }) + algoItem.toggleSaved = false this.removeFeed(uri) + this.removePinnedFeed(uri) } catch (e: any) { this.rootStore.log.error('Failed to unsanve feed', e) } diff --git a/src/view/com/algos/AlgoItem.tsx b/src/view/com/algos/AlgoItem.tsx index f7d320530..b52a7e00d 100644 --- a/src/view/com/algos/AlgoItem.tsx +++ b/src/view/com/algos/AlgoItem.tsx @@ -13,7 +13,7 @@ import {UserAvatar} from '../util/UserAvatar' import {Button} from '../util/forms/Button' import {observer} from 'mobx-react-lite' import {AlgoItemModel} from 'state/models/feeds/algo/algo-item' -import {useNavigation} from '@react-navigation/native' +import {useFocusEffect, useNavigation} from '@react-navigation/native' import {NavigationProp} from 'lib/routes/types' import {useStores} from 'state/index' import {HeartIconSolid} from 'lib/icons' @@ -34,6 +34,11 @@ const AlgoItem = observer( const pal = usePalette('default') const navigation = useNavigation<NavigationProp>() + // TODO: this is pretty hacky, but it works for now + useFocusEffect(() => { + item.reload() + }) + return ( <TouchableOpacity accessibilityRole="button" @@ -78,14 +83,12 @@ const AlgoItem = observer( </View> <View> <Button - type="inverted" + type={item.isSaved ? 'default' : 'inverted'} onPress={() => { if (item.data.viewer?.saved) { - item.unsave() - store.me.savedFeeds.removeFeed(item.data.uri) + store.me.savedFeeds.unsave(item) } else { - item.save() - store.me.savedFeeds.addFeed(item) + store.me.savedFeeds.save(item) } }} label={item.data.viewer?.saved ? 'Unsave' : 'Save'} diff --git a/src/view/com/pager/FeedsTabBarMobile.tsx b/src/view/com/pager/FeedsTabBarMobile.tsx index 3d1ed2c10..0952cb14c 100644 --- a/src/view/com/pager/FeedsTabBarMobile.tsx +++ b/src/view/com/pager/FeedsTabBarMobile.tsx @@ -33,8 +33,12 @@ export const FeedsTabBar = observer( }, [store]) const items = useMemo( - () => ['Following', "What's hot", ...store.me.savedFeeds.listOfFeedNames], - [store.me.savedFeeds.listOfFeedNames], + () => [ + 'Following', + "What's hot", + ...store.me.savedFeeds.listOfPinnedFeedNames, + ], + [store.me.savedFeeds.listOfPinnedFeedNames], ) return ( diff --git a/src/view/screens/CustomFeed.tsx b/src/view/screens/CustomFeed.tsx index 97dd1cf81..ec39b27d3 100644 --- a/src/view/screens/CustomFeed.tsx +++ b/src/view/screens/CustomFeed.tsx @@ -64,11 +64,9 @@ export const CustomFeed = withAuthRequired( style={[styles.saveButton]} onPress={() => { if (currentFeed?.data.viewer?.saved) { - currentFeed?.unsave() - rootStore.me.savedFeeds.removeFeed(currentFeed!.data.uri) + rootStore.me.savedFeeds.unsave(currentFeed!) } else { - currentFeed!.save() - rootStore.me.savedFeeds.addFeed(currentFeed!) + rootStore.me.savedFeeds.save(currentFeed!) } }} label={currentFeed?.data.viewer?.saved ? 'Unsave' : 'Save'} diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx index 4806ed97b..3db9a4378 100644 --- a/src/view/screens/Home.tsx +++ b/src/view/screens/Home.tsx @@ -112,7 +112,7 @@ export const HomeScreen = withAuthRequired( feed={algoFeed} renderEmptyState={renderWhatsHotEmptyState} /> - {store.me.savedFeeds.feeds.map((f, index) => { + {store.me.savedFeeds.pinned.map((f, index) => { return ( <FeedPage key={String(2 + index + 1)} |