diff options
Diffstat (limited to 'src/lib')
36 files changed, 71 insertions, 62 deletions
diff --git a/src/lib/api/feed/merge.ts b/src/lib/api/feed/merge.ts index b41e82fb0..35c344055 100644 --- a/src/lib/api/feed/merge.ts +++ b/src/lib/api/feed/merge.ts @@ -1,11 +1,11 @@ import {AppBskyFeedDefs, AppBskyFeedGetTimeline, BskyAgent} from '@atproto/api' import shuffle from 'lodash.shuffle' +import {bundleAsync} from '#/lib/async/bundle' +import {timeout} from '#/lib/async/timeout' +import {feedUriToHref} from '#/lib/strings/url-helpers' import {getContentLanguages} from '#/state/preferences/languages' import {FeedParams} from '#/state/queries/post-feed' -import {bundleAsync} from 'lib/async/bundle' -import {timeout} from 'lib/async/timeout' -import {feedUriToHref} from 'lib/strings/url-helpers' import {FeedTuner} from '../feed-manip' import {FeedTunerFn} from '../feed-manip' import {FeedAPI, FeedAPIResponse, ReasonFeedSource} from './types' diff --git a/src/lib/async/retry.ts b/src/lib/async/retry.ts index f14ae6cf6..abf78de55 100644 --- a/src/lib/async/retry.ts +++ b/src/lib/async/retry.ts @@ -1,4 +1,4 @@ -import {isNetworkError} from 'lib/strings/errors' +import {isNetworkError} from '#/lib/strings/errors' export async function retry<P>( retries: number, diff --git a/src/lib/custom-animations/CountWheel.tsx b/src/lib/custom-animations/CountWheel.tsx index 2e435f7d3..b4ca62c6e 100644 --- a/src/lib/custom-animations/CountWheel.tsx +++ b/src/lib/custom-animations/CountWheel.tsx @@ -8,10 +8,10 @@ import Animated, { } from 'react-native-reanimated' import {i18n} from '@lingui/core' -import {decideShouldRoll} from 'lib/custom-animations/util' -import {s} from 'lib/styles' -import {formatCount} from 'view/com/util/numeric/format' -import {Text} from 'view/com/util/text/Text' +import {decideShouldRoll} from '#/lib/custom-animations/util' +import {s} from '#/lib/styles' +import {formatCount} from '#/view/com/util/numeric/format' +import {Text} from '#/view/com/util/text/Text' import {atoms as a, useTheme} from '#/alf' const animationConfig = { diff --git a/src/lib/custom-animations/CountWheel.web.tsx b/src/lib/custom-animations/CountWheel.web.tsx index 78120b707..980ed06e6 100644 --- a/src/lib/custom-animations/CountWheel.web.tsx +++ b/src/lib/custom-animations/CountWheel.web.tsx @@ -3,10 +3,10 @@ import {View} from 'react-native' import {useReducedMotion} from 'react-native-reanimated' import {i18n} from '@lingui/core' -import {decideShouldRoll} from 'lib/custom-animations/util' -import {s} from 'lib/styles' -import {formatCount} from 'view/com/util/numeric/format' -import {Text} from 'view/com/util/text/Text' +import {decideShouldRoll} from '#/lib/custom-animations/util' +import {s} from '#/lib/styles' +import {formatCount} from '#/view/com/util/numeric/format' +import {Text} from '#/view/com/util/text/Text' import {atoms as a, useTheme} from '#/alf' const animationConfig = { diff --git a/src/lib/custom-animations/LikeIcon.tsx b/src/lib/custom-animations/LikeIcon.tsx index ee3d413e5..5c736e88d 100644 --- a/src/lib/custom-animations/LikeIcon.tsx +++ b/src/lib/custom-animations/LikeIcon.tsx @@ -6,7 +6,7 @@ import Animated, { useReducedMotion, } from 'react-native-reanimated' -import {s} from 'lib/styles' +import {s} from '#/lib/styles' import {useTheme} from '#/alf' import { Heart2_Filled_Stroke2_Corner0_Rounded as HeartIconFilled, diff --git a/src/lib/custom-animations/LikeIcon.web.tsx b/src/lib/custom-animations/LikeIcon.web.tsx index 9a70212fe..79a646e6d 100644 --- a/src/lib/custom-animations/LikeIcon.web.tsx +++ b/src/lib/custom-animations/LikeIcon.web.tsx @@ -2,7 +2,7 @@ import React from 'react' import {View} from 'react-native' import {useReducedMotion} from 'react-native-reanimated' -import {s} from 'lib/styles' +import {s} from '#/lib/styles' import {useTheme} from '#/alf' import { Heart2_Filled_Stroke2_Corner0_Rounded as HeartIconFilled, diff --git a/src/lib/generate-starterpack.ts b/src/lib/generate-starterpack.ts index dba98b942..3be338ac8 100644 --- a/src/lib/generate-starterpack.ts +++ b/src/lib/generate-starterpack.ts @@ -8,11 +8,11 @@ import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useMutation} from '@tanstack/react-query' -import {until} from 'lib/async/until' -import {sanitizeDisplayName} from 'lib/strings/display-names' -import {sanitizeHandle} from 'lib/strings/handles' -import {enforceLen} from 'lib/strings/helpers' -import {useAgent} from 'state/session' +import {until} from '#/lib/async/until' +import {sanitizeDisplayName} from '#/lib/strings/display-names' +import {sanitizeHandle} from '#/lib/strings/handles' +import {enforceLen} from '#/lib/strings/helpers' +import {useAgent} from '#/state/session' export const createStarterPackList = async ({ name, diff --git a/src/lib/hooks/useAnimatedScrollHandler_FIXED.web.ts b/src/lib/hooks/useAnimatedScrollHandler_FIXED.web.ts index 98e05a8ce..7f8a99506 100644 --- a/src/lib/hooks/useAnimatedScrollHandler_FIXED.web.ts +++ b/src/lib/hooks/useAnimatedScrollHandler_FIXED.web.ts @@ -1,4 +1,4 @@ -import {useRef, useEffect} from 'react' +import {useEffect, useRef} from 'react' import {useAnimatedScrollHandler as useAnimatedScrollHandler_BUGGY} from 'react-native-reanimated' export const useAnimatedScrollHandler: typeof useAnimatedScrollHandler_BUGGY = ( diff --git a/src/lib/hooks/useBottomBarOffset.ts b/src/lib/hooks/useBottomBarOffset.ts index 945c98062..abe18c81b 100644 --- a/src/lib/hooks/useBottomBarOffset.ts +++ b/src/lib/hooks/useBottomBarOffset.ts @@ -1,8 +1,8 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context' -import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' -import {clamp} from 'lib/numbers' -import {isWeb} from 'platform/detection' +import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries' +import {clamp} from '#/lib/numbers' +import {isWeb} from '#/platform/detection' export function useBottomBarOffset(modifier: number = 0) { const {isTabletOrDesktop} = useWebMediaQueries() diff --git a/src/lib/hooks/useColorSchemeStyle.ts b/src/lib/hooks/useColorSchemeStyle.ts index 100dc44e4..8b79e9e42 100644 --- a/src/lib/hooks/useColorSchemeStyle.ts +++ b/src/lib/hooks/useColorSchemeStyle.ts @@ -1,4 +1,4 @@ -import {useTheme} from 'lib/ThemeContext' +import {useTheme} from '#/lib/ThemeContext' export function useColorSchemeStyle<T>(lightStyle: T, darkStyle: T) { const colorScheme = useTheme().colorScheme diff --git a/src/lib/hooks/useCustomPalette.ts b/src/lib/hooks/useCustomPalette.ts index 4f8f5c836..5691ea79b 100644 --- a/src/lib/hooks/useCustomPalette.ts +++ b/src/lib/hooks/useCustomPalette.ts @@ -1,6 +1,7 @@ import React from 'react' -import {useTheme} from 'lib/ThemeContext' -import {choose} from 'lib/functions' + +import {choose} from '#/lib/functions' +import {useTheme} from '#/lib/ThemeContext' export function useCustomPalette<T>({light, dark}: {light: T; dark: T}) { const theme = useTheme() diff --git a/src/lib/hooks/useDraggableScrollView.ts b/src/lib/hooks/useDraggableScrollView.ts index b0f7465d7..3471d0d06 100644 --- a/src/lib/hooks/useDraggableScrollView.ts +++ b/src/lib/hooks/useDraggableScrollView.ts @@ -1,7 +1,8 @@ -import {useEffect, useRef, useMemo, ForwardedRef} from 'react' -import {Platform, findNodeHandle} from 'react-native' +import {ForwardedRef, useEffect, useMemo, useRef} from 'react' import type {ScrollView} from 'react-native' -import {mergeRefs} from 'lib/merge-refs' +import {findNodeHandle, Platform} from 'react-native' + +import {mergeRefs} from '#/lib/merge-refs' type Props<Scrollable extends ScrollView = ScrollView> = { cursor?: string diff --git a/src/lib/hooks/useGoBack.ts b/src/lib/hooks/useGoBack.ts index 59555bdac..e5a39f745 100644 --- a/src/lib/hooks/useGoBack.ts +++ b/src/lib/hooks/useGoBack.ts @@ -1,6 +1,6 @@ import {StackActions, useNavigation} from '@react-navigation/native' -import {NavigationProp} from 'lib/routes/types' +import {NavigationProp} from '#/lib/routes/types' import {router} from '#/routes' export function useGoBack(onGoBack?: () => unknown) { diff --git a/src/lib/hooks/useInitialNumToRender.ts b/src/lib/hooks/useInitialNumToRender.ts index f729cbffa..fd80d5d77 100644 --- a/src/lib/hooks/useInitialNumToRender.ts +++ b/src/lib/hooks/useInitialNumToRender.ts @@ -1,7 +1,7 @@ import {useWindowDimensions} from 'react-native' import {useSafeAreaInsets} from 'react-native-safe-area-context' -import {useBottomBarOffset} from 'lib/hooks/useBottomBarOffset' +import {useBottomBarOffset} from '#/lib/hooks/useBottomBarOffset' const MIN_POST_HEIGHT = 100 diff --git a/src/lib/hooks/useIsKeyboardVisible.ts b/src/lib/hooks/useIsKeyboardVisible.ts index 38fc80bde..5a9bbd574 100644 --- a/src/lib/hooks/useIsKeyboardVisible.ts +++ b/src/lib/hooks/useIsKeyboardVisible.ts @@ -1,6 +1,7 @@ -import {useState, useEffect} from 'react' +import {useEffect, useState} from 'react' import {Keyboard} from 'react-native' -import {isIOS} from 'platform/detection' + +import {isIOS} from '#/platform/detection' export function useIsKeyboardVisible({ iosUseWillEvents, diff --git a/src/lib/hooks/useNavigationDeduped.ts b/src/lib/hooks/useNavigationDeduped.ts index d913f7f3d..56ae5e8a2 100644 --- a/src/lib/hooks/useNavigationDeduped.ts +++ b/src/lib/hooks/useNavigationDeduped.ts @@ -1,9 +1,10 @@ import React from 'react' import {useNavigation} from '@react-navigation/core' -import {AllNavigatorParams, NavigationProp} from 'lib/routes/types' -import type {NavigationAction} from '@react-navigation/routers' import {NavigationState} from '@react-navigation/native' -import {useDedupe} from 'lib/hooks/useDedupe' +import type {NavigationAction} from '@react-navigation/routers' + +import {useDedupe} from '#/lib/hooks/useDedupe' +import {AllNavigatorParams, NavigationProp} from '#/lib/routes/types' export type DebouncedNavigationProp = Pick< NavigationProp, diff --git a/src/lib/hooks/useNavigationTabState.ts b/src/lib/hooks/useNavigationTabState.ts index e1fa95008..2d15bce56 100644 --- a/src/lib/hooks/useNavigationTabState.ts +++ b/src/lib/hooks/useNavigationTabState.ts @@ -1,6 +1,6 @@ import {useNavigationState} from '@react-navigation/native' -import {getTabState, TabState} from 'lib/routes/helpers' +import {getTabState, TabState} from '#/lib/routes/helpers' export function useNavigationTabState() { return useNavigationState(state => { diff --git a/src/lib/hooks/useNavigationTabState.web.ts b/src/lib/hooks/useNavigationTabState.web.ts index e86d6c6c3..03dcbbb03 100644 --- a/src/lib/hooks/useNavigationTabState.web.ts +++ b/src/lib/hooks/useNavigationTabState.web.ts @@ -1,6 +1,6 @@ import {useNavigationState} from '@react-navigation/native' -import {getCurrentRoute} from 'lib/routes/helpers' +import {getCurrentRoute} from '#/lib/routes/helpers' export function useNavigationTabState() { return useNavigationState(state => { diff --git a/src/lib/hooks/useOTAUpdates.ts b/src/lib/hooks/useOTAUpdates.ts index a1692e62c..731406dce 100644 --- a/src/lib/hooks/useOTAUpdates.ts +++ b/src/lib/hooks/useOTAUpdates.ts @@ -10,9 +10,9 @@ import { useUpdates, } from 'expo-updates' +import {IS_TESTFLIGHT} from '#/lib/app-info' import {logger} from '#/logger' -import {IS_TESTFLIGHT} from 'lib/app-info' -import {isIOS} from 'platform/detection' +import {isIOS} from '#/platform/detection' const MINIMUM_MINIMIZE_TIME = 15 * 60e3 diff --git a/src/lib/hooks/usePalette.ts b/src/lib/hooks/usePalette.ts index eeb43d0b1..2530642f6 100644 --- a/src/lib/hooks/usePalette.ts +++ b/src/lib/hooks/usePalette.ts @@ -1,6 +1,7 @@ import {useMemo} from 'react' import {TextStyle, ViewStyle} from 'react-native' -import {useTheme, PaletteColorName, PaletteColor} from '../ThemeContext' + +import {PaletteColor, PaletteColorName, useTheme} from '../ThemeContext' export interface UsePaletteValue { colors: PaletteColor diff --git a/src/lib/hooks/usePermissions.ts b/src/lib/hooks/usePermissions.ts index d248e1975..6da14232f 100644 --- a/src/lib/hooks/usePermissions.ts +++ b/src/lib/hooks/usePermissions.ts @@ -2,8 +2,8 @@ import {Linking} from 'react-native' import {Camera} from 'expo-camera/legacy' // TODO: Migrate to the new one. import * as MediaLibrary from 'expo-media-library' -import {isWeb} from 'platform/detection' -import {Alert} from 'view/com/util/Alert' +import {isWeb} from '#/platform/detection' +import {Alert} from '#/view/com/util/Alert' const openPermissionAlert = (perm: string) => { Alert.alert( diff --git a/src/lib/hooks/useSetTitle.ts b/src/lib/hooks/useSetTitle.ts index 129023f71..fa1e2a5b1 100644 --- a/src/lib/hooks/useSetTitle.ts +++ b/src/lib/hooks/useSetTitle.ts @@ -1,8 +1,8 @@ import {useEffect} from 'react' import {useNavigation} from '@react-navigation/native' -import {NavigationProp} from 'lib/routes/types' -import {bskyTitle} from 'lib/strings/headings' +import {NavigationProp} from '#/lib/routes/types' +import {bskyTitle} from '#/lib/strings/headings' import {useUnreadNotifications} from '#/state/queries/notifications/unread' export function useSetTitle(title?: string) { diff --git a/src/lib/hooks/useTabFocusEffect.ts b/src/lib/hooks/useTabFocusEffect.ts index e446084c5..a54a3af73 100644 --- a/src/lib/hooks/useTabFocusEffect.ts +++ b/src/lib/hooks/useTabFocusEffect.ts @@ -1,6 +1,7 @@ import {useEffect, useState} from 'react' import {useNavigation} from '@react-navigation/native' -import {getTabState, TabState} from 'lib/routes/helpers' + +import {getTabState, TabState} from '#/lib/routes/helpers' export function useTabFocusEffect( tabName: string, diff --git a/src/lib/hooks/useToggleMutationQueue.ts b/src/lib/hooks/useToggleMutationQueue.ts index 28ae86142..c4b86d325 100644 --- a/src/lib/hooks/useToggleMutationQueue.ts +++ b/src/lib/hooks/useToggleMutationQueue.ts @@ -1,4 +1,4 @@ -import {useState, useRef, useEffect, useCallback} from 'react' +import {useCallback, useEffect, useRef, useState} from 'react' type Task<TServerState> = { isOn: boolean diff --git a/src/lib/hooks/useWebMediaQueries.tsx b/src/lib/hooks/useWebMediaQueries.tsx index 71a96a89b..fa9d6ffa6 100644 --- a/src/lib/hooks/useWebMediaQueries.tsx +++ b/src/lib/hooks/useWebMediaQueries.tsx @@ -1,5 +1,6 @@ import {useMediaQuery} from 'react-responsive' -import {isNative} from 'platform/detection' + +import {isNative} from '#/platform/detection' export function useWebMediaQueries() { const isDesktop = useMediaQuery({minWidth: 1300}) diff --git a/src/lib/hooks/useWebScrollRestoration.ts b/src/lib/hooks/useWebScrollRestoration.ts index f68fbf0f2..36484ba0f 100644 --- a/src/lib/hooks/useWebScrollRestoration.ts +++ b/src/lib/hooks/useWebScrollRestoration.ts @@ -1,4 +1,4 @@ -import {useMemo, useState, useEffect} from 'react' +import {useEffect, useMemo, useState} from 'react' import {EventArg, useNavigation} from '@react-navigation/core' if ('scrollRestoration' in history) { diff --git a/src/lib/media/image-sizes.ts b/src/lib/media/image-sizes.ts index 4ea95ea23..7a1555688 100644 --- a/src/lib/media/image-sizes.ts +++ b/src/lib/media/image-sizes.ts @@ -1,5 +1,6 @@ import {Image} from 'react-native' -import type {Dimensions} from 'lib/media/types' + +import type {Dimensions} from '#/lib/media/types' const sizes: Map<string, Dimensions> = new Map() const activeRequests: Map<string, Promise<Dimensions>> = new Map() diff --git a/src/lib/media/video/compress.web.ts b/src/lib/media/video/compress.web.ts index 7f057d2ea..ef868792a 100644 --- a/src/lib/media/video/compress.web.ts +++ b/src/lib/media/video/compress.web.ts @@ -1,6 +1,6 @@ import {ImagePickerAsset} from 'expo-image-picker' -import {VideoTooLargeError} from 'lib/media/video/errors' +import {VideoTooLargeError} from '#/lib/media/video/errors' import {CompressedVideo} from './types' const MAX_VIDEO_SIZE = 1024 * 1024 * 50 // 50mb diff --git a/src/lib/moderation/create-sanitized-display-name.ts b/src/lib/moderation/create-sanitized-display-name.ts index 5863503f5..4f9584f91 100644 --- a/src/lib/moderation/create-sanitized-display-name.ts +++ b/src/lib/moderation/create-sanitized-display-name.ts @@ -1,7 +1,7 @@ import {AppBskyActorDefs} from '@atproto/api' -import {sanitizeDisplayName} from 'lib/strings/display-names' -import {sanitizeHandle} from 'lib/strings/handles' +import {sanitizeDisplayName} from '#/lib/strings/display-names' +import {sanitizeHandle} from '#/lib/strings/handles' export function createSanitizedDisplayName( profile: diff --git a/src/lib/moderation/useLabelBehaviorDescription.ts b/src/lib/moderation/useLabelBehaviorDescription.ts index 0250c1bc8..4e773e0f0 100644 --- a/src/lib/moderation/useLabelBehaviorDescription.ts +++ b/src/lib/moderation/useLabelBehaviorDescription.ts @@ -1,6 +1,6 @@ import {InterpretedLabelValueDefinition, LabelPreference} from '@atproto/api' -import {useLingui} from '@lingui/react' import {msg} from '@lingui/macro' +import {useLingui} from '@lingui/react' export function useLabelBehaviorDescription( labelValueDef: InterpretedLabelValueDefinition, diff --git a/src/lib/notifications/notifications.ts b/src/lib/notifications/notifications.ts index 88b9eee3a..dfdc3b49c 100644 --- a/src/lib/notifications/notifications.ts +++ b/src/lib/notifications/notifications.ts @@ -3,10 +3,10 @@ import * as Notifications from 'expo-notifications' import {getBadgeCountAsync, setBadgeCountAsync} from 'expo-notifications' import {BskyAgent} from '@atproto/api' +import {logEvent} from '#/lib/statsig/statsig' import {logger} from '#/logger' +import {devicePlatform, isAndroid, isNative} from '#/platform/detection' import {SessionAccount, useAgent, useSession} from '#/state/session' -import {logEvent} from 'lib/statsig/statsig' -import {devicePlatform, isAndroid, isNative} from 'platform/detection' import BackgroundNotificationHandler from '../../../modules/expo-background-notification-handler' const SERVICE_DID = (serviceUrl?: string) => diff --git a/src/lib/routes/links.ts b/src/lib/routes/links.ts index 56b716677..8a9950262 100644 --- a/src/lib/routes/links.ts +++ b/src/lib/routes/links.ts @@ -1,6 +1,6 @@ import {AppBskyGraphDefs, AtUri} from '@atproto/api' -import {isInvalidHandle} from 'lib/strings/handles' +import {isInvalidHandle} from '#/lib/strings/handles' export function makeProfileLink( info: { diff --git a/src/lib/sentry.ts b/src/lib/sentry.ts index 37d41e3a2..2c390d7de 100644 --- a/src/lib/sentry.ts +++ b/src/lib/sentry.ts @@ -7,7 +7,7 @@ import {Platform} from 'react-native' import {nativeApplicationVersion, nativeBuildVersion} from 'expo-application' import {init} from '@sentry/react-native' -import {BUILD_ENV, IS_DEV, IS_TESTFLIGHT} from 'lib/app-info' +import {BUILD_ENV, IS_DEV, IS_TESTFLIGHT} from '#/lib/app-info' /** * Examples: diff --git a/src/lib/strings/handles.ts b/src/lib/strings/handles.ts index 7955e1b2e..90786ac3f 100644 --- a/src/lib/strings/handles.ts +++ b/src/lib/strings/handles.ts @@ -1,6 +1,6 @@ // Regex from the go implementation // https://github.com/bluesky-social/indigo/blob/main/atproto/syntax/handle.go#L10 -import {forceLTR} from 'lib/strings/bidi' +import {forceLTR} from '#/lib/strings/bidi' const VALIDATE_REGEX = /^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/ diff --git a/src/lib/strings/rich-text-helpers.ts b/src/lib/strings/rich-text-helpers.ts index 662004599..54f0733d0 100644 --- a/src/lib/strings/rich-text-helpers.ts +++ b/src/lib/strings/rich-text-helpers.ts @@ -1,4 +1,5 @@ import {AppBskyRichtextFacet, RichText} from '@atproto/api' + import {linkRequiresWarning} from './url-helpers' export function richTextToString(rt: RichText, loose: boolean): string { diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts index 4c8db8399..c44fdf7c2 100644 --- a/src/lib/strings/url-helpers.ts +++ b/src/lib/strings/url-helpers.ts @@ -2,10 +2,10 @@ import {AtUri} from '@atproto/api' import psl from 'psl' import TLDs from 'tlds' +import {BSKY_SERVICE} from '#/lib/constants' +import {isInvalidHandle} from '#/lib/strings/handles' +import {startUriToStarterPackUri} from '#/lib/strings/starter-pack' import {logger} from '#/logger' -import {BSKY_SERVICE} from 'lib/constants' -import {isInvalidHandle} from 'lib/strings/handles' -import {startUriToStarterPackUri} from 'lib/strings/starter-pack' export const BSKY_APP_HOST = 'https://bsky.app' const BSKY_TRUSTED_HOSTS = [ |