diff options
author | Eric Bailey <git@esb.lol> | 2023-11-04 14:00:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-04 14:00:38 -0500 |
commit | 95b5e642dcca7b6fbf60cb1b86a94ba9d40415e1 (patch) | |
tree | 704c8dc022b0536951e4cb49b0006991253c3903 /src/state/models/ui | |
parent | e49a3d8a564b2aa42a8c0e66dfcbae27d096dc26 (diff) | |
parent | f6fe980a6457bc7394427b569b2e5b05ce5278f6 (diff) | |
download | voidsky-95b5e642dcca7b6fbf60cb1b86a94ba9d40415e1.tar.zst |
Merge pull request #1814 from bluesky-social/eric/replace-logger
Remove old logger
Diffstat (limited to 'src/state/models/ui')
-rw-r--r-- | src/state/models/ui/create-account.ts | 5 | ||||
-rw-r--r-- | src/state/models/ui/preferences.ts | 3 | ||||
-rw-r--r-- | src/state/models/ui/profile.ts | 13 | ||||
-rw-r--r-- | src/state/models/ui/saved-feeds.ts | 3 |
4 files changed, 11 insertions, 13 deletions
diff --git a/src/state/models/ui/create-account.ts b/src/state/models/ui/create-account.ts index 3bd39ba76..1711b530f 100644 --- a/src/state/models/ui/create-account.ts +++ b/src/state/models/ui/create-account.ts @@ -8,6 +8,7 @@ import {createFullHandle} from 'lib/strings/handles' import {cleanError} from 'lib/strings/errors' import {getAge} from 'lib/strings/time' import {track} from 'lib/analytics/analytics' +import {logger} from '#/logger' const DEFAULT_DATE = new Date(Date.now() - 60e3 * 60 * 24 * 365 * 20) // default to 20 years ago @@ -76,7 +77,7 @@ export class CreateAccountModel { this.setServiceDescription(desc) this.setUserDomain(desc.availableUserDomains[0]) } catch (err: any) { - this.rootStore.log.warn( + logger.warn( `Failed to fetch service description for ${this.serviceUrl}`, {error: err}, ) @@ -127,7 +128,7 @@ export class CreateAccountModel { errMsg = 'Invite code not accepted. Check that you input it correctly and try again.' } - this.rootStore.log.error('Failed to create account', {error: e}) + logger.error('Failed to create account', {error: e}) this.setIsProcessing(false) this.setError(cleanError(errMsg)) throw e diff --git a/src/state/models/ui/preferences.ts b/src/state/models/ui/preferences.ts index 7714d65df..6e43198a3 100644 --- a/src/state/models/ui/preferences.ts +++ b/src/state/models/ui/preferences.ts @@ -14,6 +14,7 @@ import {deviceLocales} from 'platform/detection' import {getAge} from 'lib/strings/time' import {FeedTuner} from 'lib/api/feed-manip' import {LANGUAGES} from '../../../locale/languages' +import {logger} from '#/logger' // TEMP we need to permanently convert 'show' to 'ignore', for now we manually convert -prf export type LabelPreference = APILabelPreference | 'show' @@ -246,7 +247,7 @@ export class PreferencesModel { }) await this.rootStore.agent.setSavedFeeds(saved, pinned) } catch (error) { - this.rootStore.log.error('Failed to set default feeds', {error}) + logger.error('Failed to set default feeds', {error}) } } } finally { diff --git a/src/state/models/ui/profile.ts b/src/state/models/ui/profile.ts index 47a99a8fc..f96340c65 100644 --- a/src/state/models/ui/profile.ts +++ b/src/state/models/ui/profile.ts @@ -4,6 +4,7 @@ import {ProfileModel} from '../content/profile' import {PostsFeedModel} from '../feeds/posts' import {ActorFeedsModel} from '../lists/actor-feeds' import {ListsListModel} from '../lists/lists-list' +import {logger} from '#/logger' export enum Sections { PostsNoReplies = 'Posts', @@ -223,14 +224,10 @@ export class ProfileUiModel { await Promise.all([ this.profile .setup() - .catch(err => - this.rootStore.log.error('Failed to fetch profile', {error: err}), - ), + .catch(err => logger.error('Failed to fetch profile', {error: err})), this.feed .setup() - .catch(err => - this.rootStore.log.error('Failed to fetch feed', {error: err}), - ), + .catch(err => logger.error('Failed to fetch feed', {error: err})), ]) runInAction(() => { this.isAuthenticatedUser = @@ -241,9 +238,7 @@ export class ProfileUiModel { this.lists.source = this.profile.did this.lists .loadMore() - .catch(err => - this.rootStore.log.error('Failed to fetch lists', {error: err}), - ) + .catch(err => logger.error('Failed to fetch lists', {error: err})) } async refresh() { diff --git a/src/state/models/ui/saved-feeds.ts b/src/state/models/ui/saved-feeds.ts index 72055abeb..fd84edc02 100644 --- a/src/state/models/ui/saved-feeds.ts +++ b/src/state/models/ui/saved-feeds.ts @@ -4,6 +4,7 @@ import {bundleAsync} from 'lib/async/bundle' import {cleanError} from 'lib/strings/errors' import {FeedSourceModel} from '../content/feed-source' import {track} from 'lib/analytics/analytics' +import {logger} from '#/logger' export class SavedFeedsModel { // state @@ -126,7 +127,7 @@ export class SavedFeedsModel { this.hasLoaded = true this.error = cleanError(err) if (err) { - this.rootStore.log.error('Failed to fetch user feeds', {err}) + logger.error('Failed to fetch user feeds', {err}) } } |