diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/hooks/useNotificationHandler.ts | 21 | ||||
-rw-r--r-- | src/lib/notifications/notifications.ts | 16 | ||||
-rw-r--r-- | src/lib/sentry.ts | 40 |
3 files changed, 14 insertions, 63 deletions
diff --git a/src/lib/hooks/useNotificationHandler.ts b/src/lib/hooks/useNotificationHandler.ts index 2ec3fcb79..b5566f8a6 100644 --- a/src/lib/hooks/useNotificationHandler.ts +++ b/src/lib/hooks/useNotificationHandler.ts @@ -6,7 +6,7 @@ import {useQueryClient} from '@tanstack/react-query' import {useAccountSwitcher} from '#/lib/hooks/useAccountSwitcher' import {NavigationProp} from '#/lib/routes/types' import {logEvent} from '#/lib/statsig/statsig' -import {logger} from '#/logger' +import {Logger} from '#/logger' import {isAndroid} from '#/platform/detection' import {useCurrentConvoId} from '#/state/messages/current-convo-id' import {RQKEY as RQKEY_NOTIFS} from '#/state/queries/notifications/feed' @@ -50,6 +50,8 @@ const DEFAULT_HANDLER_OPTIONS = { let storedPayload: NotificationPayload | undefined let prevDate = 0 +const logger = Logger.create(Logger.Context.Notifications) + export function useNotificationsHandler() { const queryClient = useQueryClient() const {currentAccount, accounts} = useSession() @@ -186,11 +188,7 @@ export function useNotificationsHandler() { return DEFAULT_HANDLER_OPTIONS } - logger.debug( - 'Notifications: received', - {e}, - logger.DebugContext.notifications, - ) + logger.debug('Notifications: received', {e}) const payload = e.request.trigger.payload as NotificationPayload if ( @@ -217,13 +215,9 @@ export function useNotificationsHandler() { } prevDate = e.notification.date - logger.debug( - 'Notifications: response received', - { - actionIdentifier: e.actionIdentifier, - }, - logger.DebugContext.notifications, - ) + logger.debug('Notifications: response received', { + actionIdentifier: e.actionIdentifier, + }) if ( e.actionIdentifier === Notifications.DEFAULT_ACTION_IDENTIFIER && @@ -235,7 +229,6 @@ export function useNotificationsHandler() { logger.debug( 'User pressed a notification, opening notifications tab', {}, - logger.DebugContext.notifications, ) logEvent('notifications:openApp', {}) invalidateCachedUnreadPage() diff --git a/src/lib/notifications/notifications.ts b/src/lib/notifications/notifications.ts index dfdc3b49c..ab7fc5708 100644 --- a/src/lib/notifications/notifications.ts +++ b/src/lib/notifications/notifications.ts @@ -4,7 +4,7 @@ import {getBadgeCountAsync, setBadgeCountAsync} from 'expo-notifications' import {BskyAgent} from '@atproto/api' import {logEvent} from '#/lib/statsig/statsig' -import {logger} from '#/logger' +import {Logger} from '#/logger' import {devicePlatform, isAndroid, isNative} from '#/platform/detection' import {SessionAccount, useAgent, useSession} from '#/state/session' import BackgroundNotificationHandler from '../../../modules/expo-background-notification-handler' @@ -14,6 +14,8 @@ const SERVICE_DID = (serviceUrl?: string) => ? 'did:web:api.staging.bsky.dev' : 'did:web:api.bsky.app' +const logger = Logger.create(Logger.Context.Notifications) + async function registerPushToken( agent: BskyAgent, account: SessionAccount, @@ -26,14 +28,10 @@ async function registerPushToken( token: token.data, appId: 'xyz.blueskyweb.app', }) - logger.debug( - 'Notifications: Sent push token (init)', - { - tokenType: token.type, - token: token.data, - }, - logger.DebugContext.notifications, - ) + logger.debug('Notifications: Sent push token (init)', { + tokenType: token.type, + token: token.data, + }) } catch (error) { logger.error('Notifications: Failed to set push token', {message: error}) } diff --git a/src/lib/sentry.ts b/src/lib/sentry.ts deleted file mode 100644 index b2695694d..000000000 --- a/src/lib/sentry.ts +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Importing these separately from `platform/detection` and `lib/app-info` to - * avoid future conflicts and/or circular deps - */ - -import {Platform} from 'react-native' -import {nativeApplicationVersion, nativeBuildVersion} from 'expo-application' -import {init} from '@sentry/react-native' - -import {IS_TESTFLIGHT} from '#/lib/app-info' - -/** - * Examples: - * - `dev` - * - `1.57.0` - */ -const release = nativeApplicationVersion ?? 'dev' - -/** - * Examples: - * - `web.dev` - * - `ios.dev` - * - `android.dev` - * - `web.1.57.0` - * - `ios.1.57.0.3` - * - `android.1.57.0.46` - */ -const dist = `${Platform.OS}.${nativeBuildVersion}.${ - IS_TESTFLIGHT ? 'tf' : '' -}${__DEV__ ? 'dev' : ''}` - -init({ - enabled: !__DEV__, - autoSessionTracking: false, - dsn: 'https://05bc3789bf994b81bd7ce20c86ccd3ae@o4505071687041024.ingest.sentry.io/4505071690514432', - debug: false, // If `true`, Sentry will try to print out useful debugging information if something goes wrong with sending the event. Set it to `false` in production - environment: process.env.NODE_ENV, - dist, - release, -}) |