diff options
Diffstat (limited to 'src/state/models')
-rw-r--r-- | src/state/models/feeds/custom-feed.ts (renamed from src/state/models/feeds/algo/algo-item.ts) | 5 | ||||
-rw-r--r-- | src/state/models/lists/actor-feeds.ts (renamed from src/state/models/feeds/algo/actor.ts) | 9 | ||||
-rw-r--r-- | src/state/models/me.ts | 2 | ||||
-rw-r--r-- | src/state/models/ui/profile.ts | 2 | ||||
-rw-r--r-- | src/state/models/ui/saved-feeds.ts (renamed from src/state/models/feeds/algo/saved.ts) | 28 |
5 files changed, 23 insertions, 23 deletions
diff --git a/src/state/models/feeds/algo/algo-item.ts b/src/state/models/feeds/custom-feed.ts index bd4ea4fd6..20eef49ad 100644 --- a/src/state/models/feeds/algo/algo-item.ts +++ b/src/state/models/feeds/custom-feed.ts @@ -2,14 +2,16 @@ import {AppBskyFeedDefs, AtUri} from '@atproto/api' import {makeAutoObservable} from 'mobx' import {RootStoreModel} from 'state/models/root-store' -export class AlgoItemModel { +export class CustomFeedModel { // data + _reactKey: string data: AppBskyFeedDefs.GeneratorView constructor( public rootStore: RootStoreModel, view: AppBskyFeedDefs.GeneratorView, ) { + this._reactKey = view.uri this.data = view makeAutoObservable( this, @@ -23,7 +25,6 @@ export class AlgoItemModel { // local actions // = set toggleSaved(value: boolean) { - console.log('toggleSaved', this.data.viewer) if (this.data.viewer) { this.data.viewer.saved = value } diff --git a/src/state/models/feeds/algo/actor.ts b/src/state/models/lists/actor-feeds.ts index e42df8495..0f2060581 100644 --- a/src/state/models/feeds/algo/actor.ts +++ b/src/state/models/lists/actor-feeds.ts @@ -1,9 +1,9 @@ import {makeAutoObservable} from 'mobx' import {AppBskyFeedGetActorFeeds as GetActorFeeds} from '@atproto/api' -import {RootStoreModel} from '../../root-store' +import {RootStoreModel} from '../root-store' import {bundleAsync} from 'lib/async/bundle' import {cleanError} from 'lib/strings/errors' -import {AlgoItemModel} from './algo-item' +import {CustomFeedModel} from '../feeds/custom-feed' const PAGE_SIZE = 30 @@ -17,7 +17,7 @@ export class ActorFeedsModel { loadMoreCursor?: string // data - feeds: AlgoItemModel[] = [] + feeds: CustomFeedModel[] = [] constructor( public rootStore: RootStoreModel, @@ -72,7 +72,6 @@ export class ActorFeedsModel { limit: PAGE_SIZE, cursor: replace ? undefined : this.loadMoreCursor, }) - console.log('res', res.data.feeds) if (replace) { this._replaceAll(res) } else { @@ -115,7 +114,7 @@ export class ActorFeedsModel { this.loadMoreCursor = res.data.cursor this.hasMore = !!this.loadMoreCursor for (const f of res.data.feeds) { - this.feeds.push(new AlgoItemModel(this.rootStore, f)) + this.feeds.push(new CustomFeedModel(this.rootStore, f)) } } } diff --git a/src/state/models/me.ts b/src/state/models/me.ts index 68c89ac9b..9b2b96832 100644 --- a/src/state/models/me.ts +++ b/src/state/models/me.ts @@ -8,7 +8,7 @@ import {PostsFeedModel} from './feeds/posts' import {NotificationsFeedModel} from './feeds/notifications' import {MyFollowsCache} from './cache/my-follows' import {isObj, hasProp} from 'lib/type-guards' -import {SavedFeedsModel} from './feeds/algo/saved' +import {SavedFeedsModel} from './ui/saved-feeds' const PROFILE_UPDATE_INTERVAL = 10 * 60 * 1e3 // 10min const NOTIFS_UPDATE_INTERVAL = 30 * 1e3 // 30sec diff --git a/src/state/models/ui/profile.ts b/src/state/models/ui/profile.ts index 4f604bfc0..2189e8e97 100644 --- a/src/state/models/ui/profile.ts +++ b/src/state/models/ui/profile.ts @@ -3,7 +3,7 @@ import {AppBskyFeedDefs} from '@atproto/api' import {RootStoreModel} from '../root-store' import {ProfileModel} from '../content/profile' import {PostsFeedModel} from '../feeds/posts' -import {ActorFeedsModel} from '../feeds/algo/actor' +import {ActorFeedsModel} from '../lists/actor-feeds' import {ListsListModel} from '../lists/lists-list' export enum Sections { diff --git a/src/state/models/feeds/algo/saved.ts b/src/state/models/ui/saved-feeds.ts index cb2015ccb..ce0de25ec 100644 --- a/src/state/models/feeds/algo/saved.ts +++ b/src/state/models/ui/saved-feeds.ts @@ -1,9 +1,9 @@ import {makeAutoObservable, runInAction} from 'mobx' import {AppBskyFeedGetSavedFeeds as GetSavedFeeds} from '@atproto/api' -import {RootStoreModel} from '../../root-store' +import {RootStoreModel} from '../root-store' import {bundleAsync} from 'lib/async/bundle' import {cleanError} from 'lib/strings/errors' -import {AlgoItemModel} from './algo-item' +import {CustomFeedModel} from '../feeds/custom-feed' import {hasProp, isObj} from 'lib/type-guards' const PAGE_SIZE = 30 @@ -18,8 +18,8 @@ export class SavedFeedsModel { loadMoreCursor?: string // data - feeds: AlgoItemModel[] = [] - pinned: AlgoItemModel[] = [] + feeds: CustomFeedModel[] = [] + pinned: CustomFeedModel[] = [] constructor(public rootStore: RootStoreModel) { makeAutoObservable( @@ -42,7 +42,7 @@ export class SavedFeedsModel { if (hasProp(v, 'pinned')) { const pinnedSerialized = (v as any).pinned as string[] const pinnedDeserialized = pinnedSerialized.map( - (s: string) => new AlgoItemModel(this.rootStore, JSON.parse(s)), + (s: string) => new CustomFeedModel(this.rootStore, JSON.parse(s)), ) this.pinned = pinnedDeserialized } @@ -83,7 +83,7 @@ export class SavedFeedsModel { ) } - togglePinnedFeed(feed: AlgoItemModel) { + togglePinnedFeed(feed: CustomFeedModel) { if (!this.isPinned(feed)) { this.pinned.push(feed) } else { @@ -95,15 +95,15 @@ export class SavedFeedsModel { this.pinned = this.pinned.filter(f => f.data.uri !== uri) } - reorderPinnedFeeds(temp: AlgoItemModel[]) { + reorderPinnedFeeds(temp: CustomFeedModel[]) { this.pinned = temp } - isPinned(feed: AlgoItemModel) { + isPinned(feed: CustomFeedModel) { return this.pinned.find(f => f.data.uri === feed.data.uri) ? true : false } - movePinnedItem(item: AlgoItemModel, direction: 'up' | 'down') { + movePinnedItem(item: CustomFeedModel, direction: 'up' | 'down') { if (this.pinned.length < 2) { throw new Error('Array must have at least 2 items') } @@ -182,11 +182,11 @@ export class SavedFeedsModel { this.feeds = this.feeds.filter(f => f.data.uri !== uri) } - addFeed(algoItem: AlgoItemModel) { - this.feeds.push(new AlgoItemModel(this.rootStore, algoItem.data)) + addFeed(algoItem: CustomFeedModel) { + this.feeds.push(new CustomFeedModel(this.rootStore, algoItem.data)) } - async save(algoItem: AlgoItemModel) { + async save(algoItem: CustomFeedModel) { try { await this.rootStore.agent.app.bsky.feed.saveFeed({ feed: algoItem.getUri, @@ -198,7 +198,7 @@ export class SavedFeedsModel { } } - async unsave(algoItem: AlgoItemModel) { + async unsave(algoItem: CustomFeedModel) { const uri = algoItem.getUri try { await this.rootStore.agent.app.bsky.feed.unsaveFeed({ @@ -243,7 +243,7 @@ export class SavedFeedsModel { this.loadMoreCursor = res.data.cursor this.hasMore = !!this.loadMoreCursor for (const f of res.data.feeds) { - this.feeds.push(new AlgoItemModel(this.rootStore, f)) + this.feeds.push(new CustomFeedModel(this.rootStore, f)) } } } |