diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts index da34bd0dc6..cbe0d889de 100644 --- a/__tests__/lib/string.test.ts +++ b/__tests__/lib/string.test.ts @@ -1,4 +1,4 @@ -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import {i18n} from '@lingui/core' import {parseEmbedPlayerFromUrl} from '#/lib/strings/embed-player' diff --git a/lexicons.json b/lexicons.json index 614e09e817..5fa2fdb0bb 100644 --- a/lexicons.json +++ b/lexicons.json @@ -726,7 +726,7 @@ }, "app.bsky.video.defs": { "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.video.defs", - "cid": "bafyreibxabe2aejhtnjbwsnt7va4bvge35p7lzcjt2nwmf2c4taww46yyq" + "cid": "bafyreicorzkcw5zp4zjsiepyakpfn3vvtpwsbqwzsy43d2y6i3t5rp3meu" }, "app.bsky.video.getJobStatus": { "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.video.getJobStatus", diff --git a/lexicons/app/bsky/unspecced/getConfig.json b/lexicons/app/bsky/unspecced/getConfig.json index 1e40f80dc2..286bc48058 100644 --- a/lexicons/app/bsky/unspecced/getConfig.json +++ b/lexicons/app/bsky/unspecced/getConfig.json @@ -11,15 +11,10 @@ "type": "object", "required": [], "properties": { - "checkEmailConfirmed": { - "type": "boolean" - }, + "checkEmailConfirmed": { "type": "boolean" }, "liveNow": { "type": "array", - "items": { - "type": "ref", - "ref": "#liveNowConfig" - } + "items": { "type": "ref", "ref": "#liveNowConfig" } } } } @@ -29,10 +24,7 @@ "type": "object", "required": ["did", "domains"], "properties": { - "did": { - "type": "string", - "format": "did" - }, + "did": { "type": "string", "format": "did" }, "domains": { "type": "array", "items": { diff --git a/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacksSkeleton.json b/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacksSkeleton.json new file mode 100644 index 0000000000..40f3a76264 --- /dev/null +++ b/lexicons/app/bsky/unspecced/getOnboardingSuggestedStarterPacksSkeleton.json @@ -0,0 +1,42 @@ +{ + "lexicon": 1, + "id": "app.bsky.unspecced.getOnboardingSuggestedStarterPacksSkeleton", + "defs": { + "main": { + "type": "query", + "description": "Get a skeleton of suggested starterpacks for onboarding. Intended to be called and hydrated by app.bsky.unspecced.getOnboardingSuggestedStarterPacks", + "parameters": { + "type": "params", + "properties": { + "viewer": { + "type": "string", + "format": "did", + "description": "DID of the account making the request (not included for public/unauthenticated queries)." + }, + "limit": { + "type": "integer", + "minimum": 1, + "maximum": 25, + "default": 10 + } + } + }, + "output": { + "encoding": "application/json", + "schema": { + "type": "object", + "required": ["starterPacks"], + "properties": { + "starterPacks": { + "type": "array", + "items": { + "type": "string", + "format": "at-uri" + } + } + } + } + } + } + } +} diff --git a/lexicons/app/bsky/unspecced/getOnboardingSuggestedUsersSkeleton.json b/lexicons/app/bsky/unspecced/getOnboardingSuggestedUsersSkeleton.json new file mode 100644 index 0000000000..1303ac174d --- /dev/null +++ b/lexicons/app/bsky/unspecced/getOnboardingSuggestedUsersSkeleton.json @@ -0,0 +1,54 @@ +{ + "lexicon": 1, + "id": "app.bsky.unspecced.getOnboardingSuggestedUsersSkeleton", + "defs": { + "main": { + "type": "query", + "description": "Get a skeleton of suggested users for onboarding. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedOnboardingUsers", + "parameters": { + "type": "params", + "properties": { + "viewer": { + "type": "string", + "format": "did", + "description": "DID of the account making the request (not included for public/unauthenticated queries)." + }, + "category": { + "type": "string", + "description": "Category of users to get suggestions for." + }, + "limit": { + "type": "integer", + "minimum": 1, + "maximum": 50, + "default": 25 + } + } + }, + "output": { + "encoding": "application/json", + "schema": { + "type": "object", + "required": ["dids"], + "properties": { + "dids": { + "type": "array", + "items": { + "type": "string", + "format": "did" + } + }, + "recId": { + "type": "string", + "description": "DEPRECATED: use recIdStr instead." + }, + "recIdStr": { + "type": "string", + "description": "Snowflake for this recommendation, use when submitting recommendation events." + } + } + } + } + } + } +} diff --git a/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json b/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json index 407ff66e3a..ee05c16a1c 100644 --- a/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json +++ b/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json @@ -14,12 +14,8 @@ "maximum": 100, "default": 50 }, - "cursor": { - "type": "string" - }, - "query": { - "type": "string" - } + "cursor": { "type": "string" }, + "query": { "type": "string" } } }, "output": { @@ -28,9 +24,7 @@ "type": "object", "required": ["feeds"], "properties": { - "cursor": { - "type": "string" - }, + "cursor": { "type": "string" }, "feeds": { "type": "array", "items": { diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscoverSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscoverSkeleton.json new file mode 100644 index 0000000000..7f017ca5e6 --- /dev/null +++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForDiscoverSkeleton.json @@ -0,0 +1,46 @@ +{ + "lexicon": 1, + "id": "app.bsky.unspecced.getSuggestedUsersForDiscoverSkeleton", + "defs": { + "main": { + "type": "query", + "description": "Get a skeleton of suggested users for the Discover page. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedUsersForDiscover", + "parameters": { + "type": "params", + "properties": { + "viewer": { + "type": "string", + "format": "did", + "description": "DID of the account making the request (not included for public/unauthenticated queries)." + }, + "limit": { + "type": "integer", + "minimum": 1, + "maximum": 50, + "default": 25 + } + } + }, + "output": { + "encoding": "application/json", + "schema": { + "type": "object", + "required": ["dids"], + "properties": { + "dids": { + "type": "array", + "items": { + "type": "string", + "format": "did" + } + }, + "recIdStr": { + "type": "string", + "description": "Snowflake for this recommendation, use when submitting recommendation events." + } + } + } + } + } + } +} diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForExploreSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForExploreSkeleton.json new file mode 100644 index 0000000000..b3f3186e84 --- /dev/null +++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForExploreSkeleton.json @@ -0,0 +1,50 @@ +{ + "lexicon": 1, + "id": "app.bsky.unspecced.getSuggestedUsersForExploreSkeleton", + "defs": { + "main": { + "type": "query", + "description": "Get a skeleton of suggested users for the Explore page. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedUsersForExplore", + "parameters": { + "type": "params", + "properties": { + "viewer": { + "type": "string", + "format": "did", + "description": "DID of the account making the request (not included for public/unauthenticated queries)." + }, + "category": { + "type": "string", + "description": "Category of users to get suggestions for." + }, + "limit": { + "type": "integer", + "minimum": 1, + "maximum": 50, + "default": 25 + } + } + }, + "output": { + "encoding": "application/json", + "schema": { + "type": "object", + "required": ["dids"], + "properties": { + "dids": { + "type": "array", + "items": { + "type": "string", + "format": "did" + } + }, + "recIdStr": { + "type": "string", + "description": "Snowflake for this recommendation, use when submitting recommendation events." + } + } + } + } + } + } +} diff --git a/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMoreSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMoreSkeleton.json new file mode 100644 index 0000000000..954b518d77 --- /dev/null +++ b/lexicons/app/bsky/unspecced/getSuggestedUsersForSeeMoreSkeleton.json @@ -0,0 +1,50 @@ +{ + "lexicon": 1, + "id": "app.bsky.unspecced.getSuggestedUsersForSeeMoreSkeleton", + "defs": { + "main": { + "type": "query", + "description": "Get a skeleton of suggested users for the See More page. Intended to be called and hydrated by app.bsky.unspecced.getSuggestedUsersForSeeMore", + "parameters": { + "type": "params", + "properties": { + "viewer": { + "type": "string", + "format": "did", + "description": "DID of the account making the request (not included for public/unauthenticated queries)." + }, + "category": { + "type": "string", + "description": "Category of users to get suggestions for." + }, + "limit": { + "type": "integer", + "minimum": 1, + "maximum": 50, + "default": 25 + } + } + }, + "output": { + "encoding": "application/json", + "schema": { + "type": "object", + "required": ["dids"], + "properties": { + "dids": { + "type": "array", + "items": { + "type": "string", + "format": "did" + } + }, + "recIdStr": { + "type": "string", + "description": "Snowflake for this recommendation, use when submitting recommendation events." + } + } + } + } + } + } +} diff --git a/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json index 466815ed47..f97504c31d 100644 --- a/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json +++ b/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json @@ -19,9 +19,7 @@ "maximum": 100, "default": 50 }, - "cursor": { - "type": "string" - }, + "cursor": { "type": "string" }, "relativeToDid": { "type": "string", "format": "did", @@ -35,9 +33,7 @@ "type": "object", "required": ["actors"], "properties": { - "cursor": { - "type": "string" - }, + "cursor": { "type": "string" }, "actors": { "type": "array", "items": { diff --git a/lexicons/app/bsky/unspecced/getTaggedSuggestions.json b/lexicons/app/bsky/unspecced/getTaggedSuggestions.json index f81459098d..9fd98ffefb 100644 --- a/lexicons/app/bsky/unspecced/getTaggedSuggestions.json +++ b/lexicons/app/bsky/unspecced/getTaggedSuggestions.json @@ -30,17 +30,12 @@ "type": "object", "required": ["tag", "subjectType", "subject"], "properties": { - "tag": { - "type": "string" - }, + "tag": { "type": "string" }, "subjectType": { "type": "string", "knownValues": ["actor", "feed"] }, - "subject": { - "type": "string", - "format": "uri" - } + "subject": { "type": "string", "format": "uri" } } } } diff --git a/lexicons/app/bsky/unspecced/getTrendsSkeleton.json b/lexicons/app/bsky/unspecced/getTrendsSkeleton.json index d0b6272bb6..3cb5a15b77 100644 --- a/lexicons/app/bsky/unspecced/getTrendsSkeleton.json +++ b/lexicons/app/bsky/unspecced/getTrendsSkeleton.json @@ -33,6 +33,10 @@ "type": "ref", "ref": "app.bsky.unspecced.defs#skeletonTrend" } + }, + "recIdStr": { + "type": "string", + "description": "Snowflake for this recommendation, use when submitting recommendation events." } } } diff --git a/lexicons/app/bsky/unspecced/initAgeAssurance.json b/lexicons/app/bsky/unspecced/initAgeAssurance.json index 236c07cf36..43c4d3cf5e 100644 --- a/lexicons/app/bsky/unspecced/initAgeAssurance.json +++ b/lexicons/app/bsky/unspecced/initAgeAssurance.json @@ -34,15 +34,9 @@ } }, "errors": [ - { - "name": "InvalidEmail" - }, - { - "name": "DidTooLong" - }, - { - "name": "InvalidInitiation" - } + { "name": "InvalidEmail" }, + { "name": "DidTooLong" }, + { "name": "InvalidInitiation" } ] } } diff --git a/lexicons/app/bsky/unspecced/searchActorsSkeleton.json b/lexicons/app/bsky/unspecced/searchActorsSkeleton.json index 71784336a3..f6489140b9 100644 --- a/lexicons/app/bsky/unspecced/searchActorsSkeleton.json +++ b/lexicons/app/bsky/unspecced/searchActorsSkeleton.json @@ -40,9 +40,7 @@ "type": "object", "required": ["actors"], "properties": { - "cursor": { - "type": "string" - }, + "cursor": { "type": "string" }, "hitsTotal": { "type": "integer", "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits." @@ -57,11 +55,7 @@ } } }, - "errors": [ - { - "name": "BadQueryString" - } - ] + "errors": [{ "name": "BadQueryString" }] } } } diff --git a/lexicons/app/bsky/unspecced/searchPostsSkeleton.json b/lexicons/app/bsky/unspecced/searchPostsSkeleton.json index 63c3cf4858..3be2c1b757 100644 --- a/lexicons/app/bsky/unspecced/searchPostsSkeleton.json +++ b/lexicons/app/bsky/unspecced/searchPostsSkeleton.json @@ -83,9 +83,7 @@ "type": "object", "required": ["posts"], "properties": { - "cursor": { - "type": "string" - }, + "cursor": { "type": "string" }, "hitsTotal": { "type": "integer", "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits." @@ -100,11 +98,7 @@ } } }, - "errors": [ - { - "name": "BadQueryString" - } - ] + "errors": [{ "name": "BadQueryString" }] } } } diff --git a/lexicons/app/bsky/video/defs.json b/lexicons/app/bsky/video/defs.json index a5bcb22bcd..278c17b35e 100644 --- a/lexicons/app/bsky/video/defs.json +++ b/lexicons/app/bsky/video/defs.json @@ -26,6 +26,13 @@ "type": "string", "description": "The state of the video processing job. All values not listed as a known value indicate that the job is in process.", "knownValues": [ + "JOB_STATE_CREATED", + "JOB_STATE_ENCODING", + "JOB_STATE_ENCODED", + "JOB_STATE_SCANNING", + "JOB_STATE_SCANNED", + "JOB_STATE_UPLOADING", + "JOB_STATE_UPLOADED", "JOB_STATE_COMPLETED", "JOB_STATE_FAILED" ] diff --git a/package.json b/package.json index 4415b0fa58..a7114fba73 100644 --- a/package.json +++ b/package.json @@ -114,11 +114,11 @@ "@bsky.app/expo-translate-text": "^0.2.9", "@bsky.app/peek-menu": "^0.3.2", "@bsky.app/react-native-uitextview": "^2.7.0", - "@bsky.app/sdk": "npm:bsky-sdk-preview@0.0.1-preview.2", "@bsky.app/sift": "^0.3.9", "@bsky.app/tapper": "^0.6.1", "@bsky.app/video": "0.3.6", "@bsky.app/video-compressor": "0.2.0", + "@bsky/sdk": "1.0.0", "@emoji-mart/data": "^1.2.1", "@emoji-mart/react": "^1.1.1", "@expo/html-elements": "^0.12.5", @@ -342,7 +342,7 @@ "^cborg$": "/node_modules/cborg/cborg.js" }, "transformIgnorePatterns": [ - "node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|nanoid|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|normalize-url|react-native-svg|@sentry/.*|sentry-expo|bcp-47-match|@atproto/.*|@bsky.app/sdk|tlds|multiformats|uint8arrays|@ipld/.*|cborg|await-lock)" + "node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|nanoid|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|normalize-url|react-native-svg|@sentry/.*|sentry-expo|bcp-47-match|@atproto/.*|@bsky/sdk|tlds|multiformats|uint8arrays|@ipld/.*|cborg|await-lock)" ], "modulePathIgnorePatterns": [ "__tests__/.*/__mocks__", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92a4d68c35..6cd00fba0a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -284,9 +284,6 @@ importers: '@bsky.app/react-native-uitextview': specifier: ^2.7.0 version: 2.7.0(react-native@0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1))(react@19.1.0) - '@bsky.app/sdk': - specifier: npm:bsky-sdk-preview@0.0.1-preview.2 - version: bsky-sdk-preview@0.0.1-preview.2(@atproto/lex@0.3.6) '@bsky.app/sift': specifier: ^0.3.9 version: 0.3.9(2d5c14016450c7e55c8cd0dffcca6f69) @@ -299,6 +296,9 @@ importers: '@bsky.app/video-compressor': specifier: 0.2.0 version: 0.2.0(83e0f64f4281e4798012214ad5b2d72d) + '@bsky/sdk': + specifier: 1.0.0 + version: 1.0.0(@atproto/lex@0.3.6) '@emoji-mart/data': specifier: ^1.2.1 version: 1.2.1 @@ -1771,6 +1771,12 @@ packages: react: '*' react-native: '*' + '@bsky/sdk@1.0.0': + resolution: {integrity: sha512-nnVYpbESETN5R/dyBLWE+5u52HkJO0+EWMv+bLDRZUkHEQtHV2RX3kLMqXaEWVJgijagziLPXb6179mkml8WZA==} + engines: {node: '>=22.12.0'} + peerDependencies: + '@atproto/lex': ^0.3.0 + '@crowdin/cli@4.14.2': resolution: {integrity: sha512-JRrHvitc0w+r/h6XXSOq917HxsjRoxPEtyNYSmylKirjiPNrRx84VKtqFlOIWIFCOZI5BoXg6hNpE0Zq7CwVBA==} hasBin: true @@ -4494,12 +4500,6 @@ packages: bser@2.1.1: resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} - bsky-sdk-preview@0.0.1-preview.2: - resolution: {integrity: sha512-LOcuvzc6UASiI5os1BUIo9dxAeVPIFiplcVSYbaDCgpH+tkpv2mqSqqsCRTP0g2CaVCwozqaTVy+jnsTO6/9BQ==} - engines: {node: '>=22.12.0'} - peerDependencies: - '@atproto/lex': ^0.3.0 - buffer-crc32@0.2.13: resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} @@ -10840,6 +10840,13 @@ snapshots: react: 19.1.0 react-native: 0.81.5(patch_hash=91fd85363059530dea649a5ca6012b933f79c8491737fbfdc685abc727e48403)(@babel/core@7.29.0(supports-color@8.1.1))(@react-native/metro-config@0.86.0(@babel/core@7.29.0(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.1.17)(react@19.1.0)(supports-color@8.1.1) + '@bsky/sdk@1.0.0(@atproto/lex@0.3.6)': + dependencies: + '@atproto-labs/handle-resolver': 0.4.8 + '@atproto/lex': 0.3.6 + '@atproto/syntax': 0.7.4 + tlds: 1.261.0 + '@crowdin/cli@4.14.2': dependencies: command-exists-promise: 2.0.2 @@ -14040,13 +14047,6 @@ snapshots: dependencies: node-int64: 0.4.0 - bsky-sdk-preview@0.0.1-preview.2(@atproto/lex@0.3.6): - dependencies: - '@atproto-labs/handle-resolver': 0.4.8 - '@atproto/lex': 0.3.6 - '@atproto/syntax': 0.7.4 - tlds: 1.261.0 - buffer-crc32@0.2.13: {} buffer-from@1.1.2: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index cbb815b851..06aef9e617 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -46,12 +46,4 @@ minimumReleaseAgeExclude: - '@atproto/*' - '@atproto-labs/*' - '@bsky.app/*' - # todo: remove when old enough - - '@oxlint-tsgolint/darwin-arm64@7.0.2001' - - '@oxlint-tsgolint/darwin-x64@7.0.2001' - - '@oxlint-tsgolint/linux-arm64@7.0.2001' - - '@oxlint-tsgolint/linux-x64@7.0.2001' - - '@oxlint-tsgolint/win32-arm64@7.0.2001' - - '@oxlint-tsgolint/win32-x64@7.0.2001' - - oxlint-tsgolint@7.0.2001 - - bsky-sdk-preview@0.0.1-preview.2 + - '@bsky/*' diff --git a/src/ageAssurance/data.tsx b/src/ageAssurance/data.tsx index 0eed2bc43f..e5cedf81ae 100644 --- a/src/ageAssurance/data.tsx +++ b/src/ageAssurance/data.tsx @@ -1,7 +1,7 @@ import {createContext, useCallback, useContext, useEffect, useMemo} from 'react' import * as AgeRange from 'expo-age-range' import {type Client} from '@atproto/lex' -import {getPreferences} from '@bsky.app/sdk' +import {getPreferences} from '@bsky/sdk' import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister' import {focusManager, QueryClient, useQuery} from '@tanstack/react-query' import {persistQueryClient} from '@tanstack/react-query-persist-client' diff --git a/src/ageAssurance/state.ts b/src/ageAssurance/state.ts index 8ede9d13fa..fb799f934e 100644 --- a/src/ageAssurance/state.ts +++ b/src/ageAssurance/state.ts @@ -1,6 +1,6 @@ import {useEffect, useMemo, useState} from 'react' import type * as AgeRange from 'expo-age-range' -import {computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils' +import {computeAgeAssuranceRegionAccess} from '@bsky/sdk/utils' import {getAge} from '#/lib/strings/time' import {useSession} from '#/state/session' diff --git a/src/ageAssurance/types.ts b/src/ageAssurance/types.ts index 79fd5f1820..b9b775396a 100644 --- a/src/ageAssurance/types.ts +++ b/src/ageAssurance/types.ts @@ -1,5 +1,5 @@ import type * as AgeRange from 'expo-age-range' -import {type computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils' +import {type computeAgeAssuranceRegionAccess} from '@bsky/sdk/utils' import {logger} from '#/ageAssurance/logger' diff --git a/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts b/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts index 8f88398ce6..5cda2ea7c3 100644 --- a/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts +++ b/src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts @@ -1,5 +1,5 @@ import {useCallback} from 'react' -import {computeAgeAssuranceRegionAccess} from '@bsky.app/sdk/utils' +import {computeAgeAssuranceRegionAccess} from '@bsky/sdk/utils' import {useAgeAssuranceServerDataContext} from '#/ageAssurance/data' import {logger} from '#/ageAssurance/logger' diff --git a/src/ageAssurance/util.ts b/src/ageAssurance/util.ts index 39bb14ab0c..d8657c157a 100644 --- a/src/ageAssurance/util.ts +++ b/src/ageAssurance/util.ts @@ -1,10 +1,10 @@ import {useMemo} from 'react' import type * as AgeRange from 'expo-age-range' -import {type ModerationPrefs} from '@bsky.app/sdk/moderation' +import {type ModerationPrefs} from '@bsky/sdk/moderation' import { computeAgeAssuranceRegionAccess, getAgeAssuranceRegionConfig, -} from '@bsky.app/sdk/utils' +} from '@bsky/sdk/utils' import {getAge} from '#/lib/strings/time' import {regionName} from '#/locale/helpers' @@ -45,28 +45,10 @@ export function getAgeAssuranceRegionConfigForGeolocation( config: app.bsky.ageassurance.defs.Config, geolocation: Geolocation, ): app.bsky.ageassurance.defs.ConfigRegion | undefined { - /* - * The SDK's region matcher takes no `platform` filter, so platform scoping - * is applied here: regions restricted to other platforms are dropped before - * matching. Once the SDK accepts a platform, this whole function body - * collapses to: - * - * return getAgeAssuranceRegionConfig(config, { - * countryCode: geolocation.countryCode ?? '', - * regionCode: geolocation.regionCode, - * platform: AGE_ASSURANCE_PLATFORM, - * }) - */ - const scoped: app.bsky.ageassurance.defs.Config = { - ...config, - regions: config.regions.filter( - region => - !region.platforms || region.platforms.includes(AGE_ASSURANCE_PLATFORM), - ), - } - return getAgeAssuranceRegionConfig(scoped, { + return getAgeAssuranceRegionConfig(config, { countryCode: geolocation.countryCode ?? '', regionCode: geolocation.regionCode, + platform: AGE_ASSURANCE_PLATFORM, }) } diff --git a/src/components/Autocomplete/useAutocomplete/index.ts b/src/components/Autocomplete/useAutocomplete/index.ts index de5009a600..1834bfca67 100644 --- a/src/components/Autocomplete/useAutocomplete/index.ts +++ b/src/components/Autocomplete/useAutocomplete/index.ts @@ -1,5 +1,5 @@ import {useCallback, useMemo} from 'react' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {keepPreviousData, useQuery} from '@tanstack/react-query' import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation' diff --git a/src/components/AvatarBubbles.tsx b/src/components/AvatarBubbles.tsx index 6189141934..685b96c57d 100644 --- a/src/components/AvatarBubbles.tsx +++ b/src/components/AvatarBubbles.tsx @@ -8,7 +8,7 @@ import Animated, { withDelay, withTiming, } from 'react-native-reanimated' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {useMaybeProfileShadow} from '#/state/cache/profile-shadow' import {useModerationOpts} from '#/state/preferences/moderation-opts' diff --git a/src/components/AvatarStack.tsx b/src/components/AvatarStack.tsx index dc7a8395c3..8c5893ed76 100644 --- a/src/components/AvatarStack.tsx +++ b/src/components/AvatarStack.tsx @@ -1,5 +1,5 @@ import {View} from 'react-native' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {logger} from '#/logger' import {useModerationOpts} from '#/state/preferences/moderation-opts' diff --git a/src/components/FeedCard.tsx b/src/components/FeedCard.tsx index b8e60ff286..bf55f218d6 100644 --- a/src/components/FeedCard.tsx +++ b/src/components/FeedCard.tsx @@ -1,7 +1,7 @@ import {useCallback, useEffect, useMemo} from 'react' import {type GestureResponderEvent, View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {RichText as RichTextApi} from '@bsky.app/sdk/richtext' +import {RichText as RichTextApi} from '@bsky/sdk/richtext' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/components/KnownFollowers.tsx b/src/components/KnownFollowers.tsx index b6f90fc401..2f1c115e64 100644 --- a/src/components/KnownFollowers.tsx +++ b/src/components/KnownFollowers.tsx @@ -1,6 +1,6 @@ import {useRef} from 'react' import {View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {makeProfileLink} from '#/lib/routes/links' diff --git a/src/components/ListCard.tsx b/src/components/ListCard.tsx index d9e15f9108..bf8e26a7f0 100644 --- a/src/components/ListCard.tsx +++ b/src/components/ListCard.tsx @@ -1,7 +1,7 @@ import {useEffect, useMemo} from 'react' import {View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {moderateUserList, type ModerationUI} from '@bsky.app/sdk/moderation' +import {moderateUserList, type ModerationUI} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/NewskieDialog.tsx b/src/components/NewskieDialog.tsx index 43025aca94..fc499a7fa0 100644 --- a/src/components/NewskieDialog.tsx +++ b/src/components/NewskieDialog.tsx @@ -1,6 +1,6 @@ import {useMemo, useState} from 'react' import {View} from 'react-native' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/Pills.tsx b/src/components/Pills.tsx index 809b197029..60d6d98557 100644 --- a/src/components/Pills.tsx +++ b/src/components/Pills.tsx @@ -1,7 +1,7 @@ import {useMemo} from 'react' import {View} from 'react-native' -import {api} from '@bsky.app/sdk' -import {type ModerationCause} from '@bsky.app/sdk/moderation' +import {api} from '@bsky/sdk' +import {type ModerationCause} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useModerationCauseDescription} from '#/lib/moderation/useModerationCauseDescription' diff --git a/src/components/Post/Embed/FeedEmbed.tsx b/src/components/Post/Embed/FeedEmbed.tsx index 9e1e3e022d..48bf58e938 100644 --- a/src/components/Post/Embed/FeedEmbed.tsx +++ b/src/components/Post/Embed/FeedEmbed.tsx @@ -1,5 +1,5 @@ import {useMemo} from 'react' -import {moderateFeedGenerator} from '@bsky.app/sdk/moderation' +import {moderateFeedGenerator} from '@bsky/sdk/moderation' import {useModerationOpts} from '#/state/preferences/moderation-opts' import {atoms as a, useTheme} from '#/alf' diff --git a/src/components/Post/Embed/ListEmbed.tsx b/src/components/Post/Embed/ListEmbed.tsx index 11ed196597..0678f389de 100644 --- a/src/components/Post/Embed/ListEmbed.tsx +++ b/src/components/Post/Embed/ListEmbed.tsx @@ -1,5 +1,5 @@ import {useMemo} from 'react' -import {moderateUserList} from '@bsky.app/sdk/moderation' +import {moderateUserList} from '@bsky/sdk/moderation' import {useModerationOpts} from '#/state/preferences/moderation-opts' import {atoms as a, useTheme} from '#/alf' diff --git a/src/components/Post/Embed/index.tsx b/src/components/Post/Embed/index.tsx index d6fde617c9..5e195ac2f9 100644 --- a/src/components/Post/Embed/index.tsx +++ b/src/components/Post/Embed/index.tsx @@ -2,8 +2,8 @@ import {useCallback, useMemo} from 'react' import {View} from 'react-native' import {type $Typed} from '@atproto/lex' import {AtUri} from '@atproto/syntax' -import {moderatePost} from '@bsky.app/sdk/moderation' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {moderatePost} from '@bsky/sdk/moderation' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {Trans} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/components/Post/Embed/types.ts b/src/components/Post/Embed/types.ts index eb478347fd..3cf2f5ff03 100644 --- a/src/components/Post/Embed/types.ts +++ b/src/components/Post/Embed/types.ts @@ -1,5 +1,5 @@ import {type StyleProp, type ViewStyle} from 'react-native' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {type app} from '#/lexicons' diff --git a/src/components/PostControls/PostMenu/PostMenuItems.tsx b/src/components/PostControls/PostMenu/PostMenuItems.tsx index 8c31ad4ce4..5cf9b0b5a4 100644 --- a/src/components/PostControls/PostMenu/PostMenuItems.tsx +++ b/src/components/PostControls/PostMenu/PostMenuItems.tsx @@ -7,7 +7,7 @@ import { } from 'react-native' import * as Clipboard from 'expo-clipboard' import {AtUri} from '@atproto/syntax' -import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {type RichText as RichTextAPI} from '@bsky/sdk/richtext' import {plural} from '@lingui/core/macro' import {useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' diff --git a/src/components/PostControls/PostMenu/index.tsx b/src/components/PostControls/PostMenu/index.tsx index 1c7e412065..23a3e52401 100644 --- a/src/components/PostControls/PostMenu/index.tsx +++ b/src/components/PostControls/PostMenu/index.tsx @@ -1,6 +1,6 @@ import {memo, useMemo, useState} from 'react' import {type Insets} from 'react-native' -import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {type RichText as RichTextAPI} from '@bsky/sdk/richtext' import {useLingui} from '@lingui/react/macro' import {type Shadow} from '#/state/cache/post-shadow' diff --git a/src/components/PostControls/ShareMenu/RecentChats.tsx b/src/components/PostControls/ShareMenu/RecentChats.tsx index 33441352fc..783a0b800a 100644 --- a/src/components/PostControls/ShareMenu/RecentChats.tsx +++ b/src/components/PostControls/ShareMenu/RecentChats.tsx @@ -1,5 +1,5 @@ import {ScrollView, View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx b/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx index c1ca0f3728..00ce8efe86 100644 --- a/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx +++ b/src/components/PostControls/ShareMenu/ShareMenuItems.types.tsx @@ -1,5 +1,5 @@ import {type PressableProps, type StyleProp, type ViewStyle} from 'react-native' -import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {type RichText as RichTextAPI} from '@bsky/sdk/richtext' import {type Shadow} from '#/state/cache/post-shadow' import {type app} from '#/lexicons' diff --git a/src/components/PostControls/ShareMenu/index.tsx b/src/components/PostControls/ShareMenu/index.tsx index e47a13bc95..6c2188b612 100644 --- a/src/components/PostControls/ShareMenu/index.tsx +++ b/src/components/PostControls/ShareMenu/index.tsx @@ -1,7 +1,7 @@ import {memo, useMemo, useState} from 'react' import {type Insets} from 'react-native' import {AtUri} from '@atproto/syntax' -import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {type RichText as RichTextAPI} from '@bsky/sdk/richtext' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' diff --git a/src/components/PostControls/index.tsx b/src/components/PostControls/index.tsx index 66dd50cb84..6457267780 100644 --- a/src/components/PostControls/index.tsx +++ b/src/components/PostControls/index.tsx @@ -1,6 +1,6 @@ import {memo, useMemo, useState} from 'react' import {type StyleProp, View, type ViewStyle} from 'react-native' -import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {type RichText as RichTextAPI} from '@bsky/sdk/richtext' import {plural} from '@lingui/core/macro' import {useLingui} from '@lingui/react/macro' diff --git a/src/components/ProfileCard.tsx b/src/components/ProfileCard.tsx index 9db85d2749..d827e0010b 100644 --- a/src/components/ProfileCard.tsx +++ b/src/components/ProfileCard.tsx @@ -6,8 +6,8 @@ import { View, type ViewStyle, } from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' -import {RichText as RichTextApi} from '@bsky.app/sdk/richtext' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' +import {RichText as RichTextApi} from '@bsky/sdk/richtext' import {useLingui} from '@lingui/react/macro' import {getModerationCauseKey} from '#/lib/moderation' diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx index 4f05f8e7ae..ccc48b8951 100644 --- a/src/components/ProfileHoverCard/index.web.tsx +++ b/src/components/ProfileHoverCard/index.web.tsx @@ -1,6 +1,6 @@ import {memo, useCallback, useEffect, useMemo, useReducer, useRef} from 'react' import {View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {flip, offset, shift, size, useFloating} from '@floating-ui/react-dom' import {msg, plural} from '@lingui/core/macro' import {useLingui} from '@lingui/react' diff --git a/src/components/ProgressGuide/FollowDialog.tsx b/src/components/ProgressGuide/FollowDialog.tsx index 3ff4569964..d7fa9c1fab 100644 --- a/src/components/ProgressGuide/FollowDialog.tsx +++ b/src/components/ProgressGuide/FollowDialog.tsx @@ -1,6 +1,6 @@ import {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react' import {TextInput, View, type ViewToken} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback' diff --git a/src/components/RichText.tsx b/src/components/RichText.tsx index ce73990570..0266dae0ce 100644 --- a/src/components/RichText.tsx +++ b/src/components/RichText.tsx @@ -1,6 +1,6 @@ import {useMemo} from 'react' import {type StyleProp, type TextStyle} from 'react-native' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {toShortUrl} from '#/lib/strings/url-helpers' import {android, atoms as a, flatten, type TextStyleProp} from '#/alf' diff --git a/src/components/StarterPack/Main/ProfilesList.tsx b/src/components/StarterPack/Main/ProfilesList.tsx index d5c29f7c0a..46ad1aac05 100644 --- a/src/components/StarterPack/Main/ProfilesList.tsx +++ b/src/components/StarterPack/Main/ProfilesList.tsx @@ -1,7 +1,7 @@ import {forwardRef, useCallback, useImperativeHandle, useState} from 'react' import {type ListRenderItemInfo, View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import { type InfiniteData, type UseInfiniteQueryResult, diff --git a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx index 04b1ae3df0..30e4218094 100644 --- a/src/components/StarterPack/Wizard/WizardEditListDialog.tsx +++ b/src/components/StarterPack/Wizard/WizardEditListDialog.tsx @@ -1,7 +1,7 @@ import {useRef} from 'react' import {type ListRenderItemInfo} from 'react-native' import {View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/StarterPack/Wizard/WizardListCard.tsx b/src/components/StarterPack/Wizard/WizardListCard.tsx index 1d33b27e40..39397f38e3 100644 --- a/src/components/StarterPack/Wizard/WizardListCard.tsx +++ b/src/components/StarterPack/Wizard/WizardListCard.tsx @@ -4,7 +4,7 @@ import { moderateProfile, type ModerationOpts, type ModerationUI, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/VideoPostCard.tsx b/src/components/VideoPostCard.tsx index ee487e0520..1005b0f49e 100644 --- a/src/components/VideoPostCard.tsx +++ b/src/components/VideoPostCard.tsx @@ -2,7 +2,7 @@ import {useMemo} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' import {LinearGradient} from 'expo-linear-gradient' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {useLingui} from '@lingui/react/macro' import {sanitizeHandle} from '#/lib/strings/handles' diff --git a/src/components/activity-notifications/SubscribeProfileButton.tsx b/src/components/activity-notifications/SubscribeProfileButton.tsx index ed05f8cba0..2749210e43 100644 --- a/src/components/activity-notifications/SubscribeProfileButton.tsx +++ b/src/components/activity-notifications/SubscribeProfileButton.tsx @@ -1,5 +1,5 @@ import {useCallback, useEffect, useState} from 'react' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useRequireEmailVerification} from '#/lib/hooks/useRequireEmailVerification' diff --git a/src/components/activity-notifications/SubscribeProfileDialog.tsx b/src/components/activity-notifications/SubscribeProfileDialog.tsx index bbb635c390..0f4b9a9ee5 100644 --- a/src/components/activity-notifications/SubscribeProfileDialog.tsx +++ b/src/components/activity-notifications/SubscribeProfileDialog.tsx @@ -1,7 +1,7 @@ import {useMemo, useState} from 'react' import {View} from 'react-native' import {type Un$Typed} from '@atproto/lex' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/contacts/screens/GetContacts.tsx b/src/components/contacts/screens/GetContacts.tsx index de5d6cf98b..534a9a708b 100644 --- a/src/components/contacts/screens/GetContacts.tsx +++ b/src/components/contacts/screens/GetContacts.tsx @@ -5,7 +5,7 @@ import * as Contacts from 'expo-contacts' import {type Un$Typed} from '@atproto/lex' import {type Client} from '@atproto/lex' import {toDatetimeString} from '@atproto/syntax' -import {upsertProfile} from '@bsky.app/sdk' +import {upsertProfile} from '@bsky/sdk' import {msg, t} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/contacts/screens/ViewMatches.tsx b/src/components/contacts/screens/ViewMatches.tsx index a659d8ae87..0d50bfdeeb 100644 --- a/src/components/contacts/screens/ViewMatches.tsx +++ b/src/components/contacts/screens/ViewMatches.tsx @@ -3,7 +3,7 @@ import {View} from 'react-native' import {useSafeAreaInsets} from 'react-native-safe-area-context' import * as SMS from 'expo-sms' import {type DidString} from '@atproto/syntax' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Plural, Trans} from '@lingui/react/macro' diff --git a/src/components/dialogs/MutedWords.tsx b/src/components/dialogs/MutedWords.tsx index 3263113a73..21f9a8728e 100644 --- a/src/components/dialogs/MutedWords.tsx +++ b/src/components/dialogs/MutedWords.tsx @@ -1,7 +1,7 @@ import {useCallback, useState} from 'react' import {View} from 'react-native' import {type DatetimeString, toDatetimeString} from '@atproto/syntax' -import {sanitizeMutedWordValue} from '@bsky.app/sdk/utils' +import {sanitizeMutedWordValue} from '@bsky/sdk/utils' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/dialogs/SearchablePeopleList.tsx b/src/components/dialogs/SearchablePeopleList.tsx index 3813a3c745..d368d25558 100644 --- a/src/components/dialogs/SearchablePeopleList.tsx +++ b/src/components/dialogs/SearchablePeopleList.tsx @@ -7,7 +7,7 @@ import { useState, } from 'react' import {TextInput, View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name' diff --git a/src/components/dialogs/lists/CreateOrEditListDialog.tsx b/src/components/dialogs/lists/CreateOrEditListDialog.tsx index 5b3a38be2b..c146d489f5 100644 --- a/src/components/dialogs/lists/CreateOrEditListDialog.tsx +++ b/src/components/dialogs/lists/CreateOrEditListDialog.tsx @@ -1,6 +1,6 @@ import {useCallback, useEffect, useMemo, useState} from 'react' import {View} from 'react-native' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Plural, Trans} from '@lingui/react/macro' diff --git a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx index ab63ea5677..78771fe413 100644 --- a/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx +++ b/src/components/dialogs/lists/ListAddRemoveUsersDialog.tsx @@ -1,6 +1,6 @@ import {useCallback, useMemo} from 'react' import {View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/dms/ActionsWrapper.tsx b/src/components/dms/ActionsWrapper.tsx index 837214b74c..f95d891104 100644 --- a/src/components/dms/ActionsWrapper.tsx +++ b/src/components/dms/ActionsWrapper.tsx @@ -1,5 +1,5 @@ import {View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {useLingui} from '@lingui/react/macro' import {MessageContextMenu} from '#/components/dms/MessageContextMenu' diff --git a/src/components/dms/ActionsWrapper.web.tsx b/src/components/dms/ActionsWrapper.web.tsx index 469c339bf8..d71befbeee 100644 --- a/src/components/dms/ActionsWrapper.web.tsx +++ b/src/components/dms/ActionsWrapper.web.tsx @@ -1,6 +1,6 @@ import {useCallback, useRef, useState} from 'react' import {Pressable, View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {plural} from '@lingui/core/macro' import {useLingui} from '@lingui/react/macro' diff --git a/src/components/dms/BlockedByListDialog.tsx b/src/components/dms/BlockedByListDialog.tsx index 2521168d79..3fabf12ecf 100644 --- a/src/components/dms/BlockedByListDialog.tsx +++ b/src/components/dms/BlockedByListDialog.tsx @@ -1,6 +1,6 @@ import {Fragment} from 'react' import {View} from 'react-native' -import {type ModerationCause} from '@bsky.app/sdk/moderation' +import {type ModerationCause} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' diff --git a/src/components/dms/ChatProfileTabs.tsx b/src/components/dms/ChatProfileTabs.tsx index 5a0e7a8fb3..d5ae8698ee 100644 --- a/src/components/dms/ChatProfileTabs.tsx +++ b/src/components/dms/ChatProfileTabs.tsx @@ -1,7 +1,7 @@ import {useCallback, useEffect} from 'react' import {type ScrollView, View} from 'react-native' import Animated, {useAnimatedRef, useSharedValue} from 'react-native-reanimated' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {useLingui} from '@lingui/react/macro' import {HITSLOP_10} from '#/lib/constants' diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx index 9aab1da8c9..e3414fd070 100644 --- a/src/components/dms/ConvoMenu.tsx +++ b/src/components/dms/ConvoMenu.tsx @@ -1,6 +1,6 @@ import {memo, useCallback} from 'react' import {Keyboard, View} from 'react-native' -import {type ModerationCause} from '@bsky.app/sdk/moderation' +import {type ModerationCause} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/components/dms/InitiateChatFlow.tsx b/src/components/dms/InitiateChatFlow.tsx index 271016a5d5..4b86eb5f0e 100644 --- a/src/components/dms/InitiateChatFlow.tsx +++ b/src/components/dms/InitiateChatFlow.tsx @@ -7,7 +7,7 @@ import { useState, } from 'react' import {LayoutAnimation, type TextInput, View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {MAX_GROUP_NAME_GRAPHEME_LENGTH} from '#/lib/constants' diff --git a/src/components/dms/MessageContextMenu.tsx b/src/components/dms/MessageContextMenu.tsx index 1807f2888d..e16af86cf6 100644 --- a/src/components/dms/MessageContextMenu.tsx +++ b/src/components/dms/MessageContextMenu.tsx @@ -2,8 +2,8 @@ import {memo, useCallback} from 'react' import {Platform} from 'react-native' import {type GestureType} from 'react-native-gesture-handler' import * as Clipboard from 'expo-clipboard' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' -import {RichText} from '@bsky.app/sdk/richtext' +import {type ModerationOpts} from '@bsky/sdk/moderation' +import {RichText} from '@bsky/sdk/richtext' import {plural} from '@lingui/core/macro' import {useLingui} from '@lingui/react/macro' diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx index 2a3d895544..ceebea16a6 100644 --- a/src/components/dms/MessageItem.tsx +++ b/src/components/dms/MessageItem.tsx @@ -22,8 +22,8 @@ import Animated, { ZoomIn, ZoomOut, } from 'react-native-reanimated' -import {moderateProfile} from '@bsky.app/sdk/moderation' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {moderateProfile} from '@bsky/sdk/moderation' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {plural} from '@lingui/core/macro' import {Trans, useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/components/dms/MessagesListBlockedFooter.tsx b/src/components/dms/MessagesListBlockedFooter.tsx index f239a66aa4..6c3b447d4c 100644 --- a/src/components/dms/MessagesListBlockedFooter.tsx +++ b/src/components/dms/MessagesListBlockedFooter.tsx @@ -1,6 +1,6 @@ import {useCallback, useMemo} from 'react' import {View} from 'react-native' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useProfileShadow} from '#/state/cache/profile-shadow' diff --git a/src/components/dms/MessagesListHeader.tsx b/src/components/dms/MessagesListHeader.tsx index adf8e3b1f5..e691486554 100644 --- a/src/components/dms/MessagesListHeader.tsx +++ b/src/components/dms/MessagesListHeader.tsx @@ -1,6 +1,6 @@ import {useMemo} from 'react' import {View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {useLingui} from '@lingui/react/macro' import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name' diff --git a/src/components/dms/components/GroupChatProfileCard.tsx b/src/components/dms/components/GroupChatProfileCard.tsx index 90d15c4b5f..a4e94c668d 100644 --- a/src/components/dms/components/GroupChatProfileCard.tsx +++ b/src/components/dms/components/GroupChatProfileCard.tsx @@ -1,5 +1,5 @@ import {View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {Trans} from '@lingui/react/macro' import {sanitizeDisplayName} from '#/lib/strings/display-names' diff --git a/src/components/dms/util.ts b/src/components/dms/util.ts index 135fb0dfaf..f44398f6f0 100644 --- a/src/components/dms/util.ts +++ b/src/components/dms/util.ts @@ -1,5 +1,5 @@ import {type $Typed} from '@atproto/lex' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {EMOJI_REACTION_LIMIT} from '#/lib/constants' import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted' diff --git a/src/components/hooks/useRichText.ts b/src/components/hooks/useRichText.ts index 5664d9b6fd..a2d25055b5 100644 --- a/src/components/hooks/useRichText.ts +++ b/src/components/hooks/useRichText.ts @@ -1,5 +1,5 @@ import {useEffect, useState} from 'react' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {useAppviewClient} from '#/state/session' diff --git a/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts b/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts index 75f5421257..8634c2eb6d 100644 --- a/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts +++ b/src/components/images/Gallery/maybeApplyGalleryOffsetStyles.ts @@ -1,4 +1,4 @@ -import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationCause, type ModerationUI} from '@bsky/sdk/moderation' import {unique} from '#/lib/moderation' import {type AppModerationCause} from '#/components/Pills' diff --git a/src/components/intents/GroupChatJoinDialog.tsx b/src/components/intents/GroupChatJoinDialog.tsx index c698219a43..9266eb7a91 100644 --- a/src/components/intents/GroupChatJoinDialog.tsx +++ b/src/components/intents/GroupChatJoinDialog.tsx @@ -1,6 +1,6 @@ import {useEffect} from 'react' import {View} from 'react-native' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/components/interstitials/FeedTrendingTopics.tsx b/src/components/interstitials/FeedTrendingTopics.tsx index a069a1b851..4d3d9fb0fa 100644 --- a/src/components/interstitials/FeedTrendingTopics.tsx +++ b/src/components/interstitials/FeedTrendingTopics.tsx @@ -1,6 +1,6 @@ import {useMemo} from 'react' import {Pressable, View} from 'react-native' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useModerationOpts} from '#/state/preferences/moderation-opts' diff --git a/src/components/moderation/ContentHider.tsx b/src/components/moderation/ContentHider.tsx index b0f8dddf01..c33c17a881 100644 --- a/src/components/moderation/ContentHider.tsx +++ b/src/components/moderation/ContentHider.tsx @@ -5,7 +5,7 @@ import { View, type ViewStyle, } from 'react-native' -import {type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationUI} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import { diff --git a/src/components/moderation/Hider.tsx b/src/components/moderation/Hider.tsx index 85d063f088..afe43e7000 100644 --- a/src/components/moderation/Hider.tsx +++ b/src/components/moderation/Hider.tsx @@ -1,5 +1,5 @@ import {createContext, useContext, useState} from 'react' -import {type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationUI} from '@bsky/sdk/moderation' import { type ModerationCauseDescription, diff --git a/src/components/moderation/LabelPreference.tsx b/src/components/moderation/LabelPreference.tsx index 80a83c5e6c..227ccae36e 100644 --- a/src/components/moderation/LabelPreference.tsx +++ b/src/components/moderation/LabelPreference.tsx @@ -2,7 +2,7 @@ import {View} from 'react-native' import { type InterpretedLabelValueDefinition, type LabelPreference, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/moderation/ModerationDetailsDialog.tsx b/src/components/moderation/ModerationDetailsDialog.tsx index 1b2351432e..d4b816e5cd 100644 --- a/src/components/moderation/ModerationDetailsDialog.tsx +++ b/src/components/moderation/ModerationDetailsDialog.tsx @@ -1,6 +1,6 @@ import {useState} from 'react' import {View} from 'react-native' -import {type ModerationCause} from '@bsky.app/sdk/moderation' +import {type ModerationCause} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/moderation/PostAlerts.tsx b/src/components/moderation/PostAlerts.tsx index 95f4c0e56e..c7a00e76eb 100644 --- a/src/components/moderation/PostAlerts.tsx +++ b/src/components/moderation/PostAlerts.tsx @@ -1,5 +1,5 @@ import {type StyleProp, View, type ViewStyle} from 'react-native' -import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationCause, type ModerationUI} from '@bsky/sdk/moderation' import {plural} from '@lingui/core/macro' import {useLingui} from '@lingui/react/macro' diff --git a/src/components/moderation/PostHider.tsx b/src/components/moderation/PostHider.tsx index 874345e084..178abd8e18 100644 --- a/src/components/moderation/PostHider.tsx +++ b/src/components/moderation/PostHider.tsx @@ -7,7 +7,7 @@ import { View, type ViewStyle, } from 'react-native' -import {type ModerationCause, type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationCause, type ModerationUI} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/components/moderation/ProfileHeaderAlerts.tsx b/src/components/moderation/ProfileHeaderAlerts.tsx index ee8d472b79..8b335fa73c 100644 --- a/src/components/moderation/ProfileHeaderAlerts.tsx +++ b/src/components/moderation/ProfileHeaderAlerts.tsx @@ -1,5 +1,5 @@ import {type StyleProp, type ViewStyle} from 'react-native' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {getModerationCauseKey, unique} from '#/lib/moderation' import * as Pills from '#/components/Pills' diff --git a/src/components/moderation/ReportDialog/action.ts b/src/components/moderation/ReportDialog/action.ts index 86a0c8cca6..da94e5dde2 100644 --- a/src/components/moderation/ReportDialog/action.ts +++ b/src/components/moderation/ReportDialog/action.ts @@ -1,5 +1,5 @@ import {type AtUriString, type DidString} from '@atproto/syntax' -import {api} from '@bsky.app/sdk' +import {api} from '@bsky/sdk' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {useMutation} from '@tanstack/react-query' diff --git a/src/components/moderation/ReportDialog/index.tsx b/src/components/moderation/ReportDialog/index.tsx index 01014a0d75..c5c60ccba4 100644 --- a/src/components/moderation/ReportDialog/index.tsx +++ b/src/components/moderation/ReportDialog/index.tsx @@ -7,7 +7,7 @@ import { useState, } from 'react' import {Pressable, type ScrollView, View} from 'react-native' -import {api} from '@bsky.app/sdk' +import {api} from '@bsky/sdk' import {Trans, useLingui} from '@lingui/react/macro' import {wait} from '#/lib/async/wait' diff --git a/src/components/moderation/ScreenHider.tsx b/src/components/moderation/ScreenHider.tsx index 9557121a05..e023b03c48 100644 --- a/src/components/moderation/ScreenHider.tsx +++ b/src/components/moderation/ScreenHider.tsx @@ -5,7 +5,7 @@ import { View, type ViewStyle, } from 'react-native' -import {type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationUI} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' diff --git a/src/features/liveEvents/context.tsx b/src/features/liveEvents/context.tsx index 0d333ba3a1..b7bdfedb90 100644 --- a/src/features/liveEvents/context.tsx +++ b/src/features/liveEvents/context.tsx @@ -1,5 +1,5 @@ import {createContext, useContext, useMemo} from 'react' -import {hasMutedWord} from '@bsky.app/sdk/moderation' +import {hasMutedWord} from '@bsky/sdk/moderation' import {QueryClient, useQuery} from '@tanstack/react-query' import {useOnAppStateChange} from '#/lib/appState' diff --git a/src/features/liveEvents/preferences.ts b/src/features/liveEvents/preferences.ts index bd8cbbd645..22265ac36c 100644 --- a/src/features/liveEvents/preferences.ts +++ b/src/features/liveEvents/preferences.ts @@ -1,5 +1,5 @@ import {useEffect} from 'react' -import {getPreferences, updateLiveEventPreferences} from '@bsky.app/sdk' +import {getPreferences, updateLiveEventPreferences} from '@bsky/sdk' import {useMutation, useQueryClient} from '@tanstack/react-query' import { diff --git a/src/features/liveNow/components/LiveStatusDialog.tsx b/src/features/liveNow/components/LiveStatusDialog.tsx index 9559ca34fd..18b6982692 100644 --- a/src/features/liveNow/components/LiveStatusDialog.tsx +++ b/src/features/liveNow/components/LiveStatusDialog.tsx @@ -1,7 +1,7 @@ import {useCallback, useMemo} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' -import {moderateStatus} from '@bsky.app/sdk/moderation' +import {moderateStatus} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/features/liveNow/index.tsx b/src/features/liveNow/index.tsx index cc9dd21fbb..0959b068bd 100644 --- a/src/features/liveNow/index.tsx +++ b/src/features/liveNow/index.tsx @@ -2,7 +2,7 @@ import {useMemo} from 'react' import {retry} from '@atproto/common-web' import {type $Typed, type l, type UriString} from '@atproto/lex' import {AtUri, toDatetimeString} from '@atproto/syntax' -import {moderateStatus} from '@bsky.app/sdk/moderation' +import {moderateStatus} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query' diff --git a/src/lib/api/index.ts b/src/lib/api/index.ts index 990d41c8d1..55b0fdecb6 100644 --- a/src/lib/api/index.ts +++ b/src/lib/api/index.ts @@ -5,7 +5,7 @@ import { toDatetimeString, type UriString, } from '@atproto/syntax' -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import {t} from '@lingui/core/macro' import {type QueryClient} from '@tanstack/react-query' diff --git a/src/lib/constants.ts b/src/lib/constants.ts index a25f42f6bc..514312aeb9 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -1,6 +1,6 @@ import {type Insets, Platform} from 'react-native' import {type Service} from '@atproto/lex' -import {api} from '@bsky.app/sdk' +import {api} from '@bsky/sdk' import {BLUESKY_PROXY_DID, CHAT_PROXY_DID, IS_DEV} from '#/env' import {type app} from '#/lexicons' diff --git a/src/lib/moderation.ts b/src/lib/moderation.ts index 9bfbf5423b..c6cd336875 100644 --- a/src/lib/moderation.ts +++ b/src/lib/moderation.ts @@ -7,7 +7,7 @@ import { type ModerationCause, type ModerationOpts, type ModerationUI, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {sanitizeDisplayName} from '#/lib/strings/display-names' import {sanitizeHandle} from '#/lib/strings/handles' diff --git a/src/lib/moderation/create-sanitized-display-name.ts b/src/lib/moderation/create-sanitized-display-name.ts index 1298afd7ef..538f180777 100644 --- a/src/lib/moderation/create-sanitized-display-name.ts +++ b/src/lib/moderation/create-sanitized-display-name.ts @@ -1,4 +1,4 @@ -import {type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationUI} from '@bsky/sdk/moderation' import {sanitizeDisplayName} from '#/lib/strings/display-names' import {sanitizeHandle} from '#/lib/strings/handles' diff --git a/src/lib/moderation/useLabelBehaviorDescription.ts b/src/lib/moderation/useLabelBehaviorDescription.ts index e97ecef33c..d1939e20fd 100644 --- a/src/lib/moderation/useLabelBehaviorDescription.ts +++ b/src/lib/moderation/useLabelBehaviorDescription.ts @@ -1,7 +1,7 @@ import { type InterpretedLabelValueDefinition, type LabelPreference, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' diff --git a/src/lib/moderation/useLabelInfo.ts b/src/lib/moderation/useLabelInfo.ts index 27ecf0ff83..80df2b1cf0 100644 --- a/src/lib/moderation/useLabelInfo.ts +++ b/src/lib/moderation/useLabelInfo.ts @@ -2,7 +2,7 @@ import { type InterpretedLabelValueDefinition, interpretLabelValueDefinition, LABELS, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {useLingui} from '@lingui/react' import * as bcp47Match from 'bcp-47-match' diff --git a/src/lib/moderation/useModerationCauseDescription.ts b/src/lib/moderation/useModerationCauseDescription.ts index c3e7d19640..2f57e38bca 100644 --- a/src/lib/moderation/useModerationCauseDescription.ts +++ b/src/lib/moderation/useModerationCauseDescription.ts @@ -1,6 +1,6 @@ import {useMemo} from 'react' -import {api} from '@bsky.app/sdk' -import {type ModerationCause} from '@bsky.app/sdk/moderation' +import {api} from '@bsky/sdk' +import {type ModerationCause} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' diff --git a/src/lib/strings/display-names.ts b/src/lib/strings/display-names.ts index 8ba2e1d215..27d90f2e39 100644 --- a/src/lib/strings/display-names.ts +++ b/src/lib/strings/display-names.ts @@ -1,4 +1,4 @@ -import {type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationUI} from '@bsky/sdk/moderation' // \u2705 = ✅ // \u2713 = ✓ diff --git a/src/lib/strings/helpers.ts b/src/lib/strings/helpers.ts index 402807f50f..001e059209 100644 --- a/src/lib/strings/helpers.ts +++ b/src/lib/strings/helpers.ts @@ -1,4 +1,4 @@ -import {type RichText} from '@bsky.app/sdk/richtext' +import {type RichText} from '@bsky/sdk/richtext' import {countGraphemes} from 'unicode-segmenter/grapheme' import {shortenLinks} from './rich-text-manip' diff --git a/src/lib/strings/rich-text-helpers.ts b/src/lib/strings/rich-text-helpers.ts index 078b91e400..6d201b7664 100644 --- a/src/lib/strings/rich-text-helpers.ts +++ b/src/lib/strings/rich-text-helpers.ts @@ -1,4 +1,4 @@ -import {type RichText} from '@bsky.app/sdk/richtext' +import {type RichText} from '@bsky/sdk/richtext' import {app} from '#/lexicons' import * as bsky from '#/types/bsky' diff --git a/src/lib/strings/rich-text-manip.ts b/src/lib/strings/rich-text-manip.ts index fa7a9b4a82..067b2f8cd7 100644 --- a/src/lib/strings/rich-text-manip.ts +++ b/src/lib/strings/rich-text-manip.ts @@ -1,4 +1,4 @@ -import {type RichText, UnicodeString} from '@bsky.app/sdk/richtext' +import {type RichText, UnicodeString} from '@bsky/sdk/richtext' import {app} from '#/lexicons' import * as bsky from '#/types/bsky' diff --git a/src/screens/Messages/Conversation.tsx b/src/screens/Messages/Conversation.tsx index a846817f50..5666e2cdb1 100644 --- a/src/screens/Messages/Conversation.tsx +++ b/src/screens/Messages/Conversation.tsx @@ -5,7 +5,7 @@ import { ScrollEdgeEffect, ScrollEdgeEffectProvider, } from '@bsky.app/expo-scroll-edge-effect' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import { type RouteProp, diff --git a/src/screens/Messages/ConversationSettings/Member.tsx b/src/screens/Messages/ConversationSettings/Member.tsx index ad6fdc6136..4c48a1bd50 100644 --- a/src/screens/Messages/ConversationSettings/Member.tsx +++ b/src/screens/Messages/ConversationSettings/Member.tsx @@ -1,5 +1,5 @@ import {View} from 'react-native' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {isBlockedOrBlocking} from '#/lib/moderation/blocked-and-muted' diff --git a/src/screens/Messages/ConversationSettings/index.tsx b/src/screens/Messages/ConversationSettings/index.tsx index 335affc9ff..ed5d74b198 100644 --- a/src/screens/Messages/ConversationSettings/index.tsx +++ b/src/screens/Messages/ConversationSettings/index.tsx @@ -1,6 +1,6 @@ import {useEffect, useState} from 'react' import {Pressable, View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' diff --git a/src/screens/Messages/JoinRequest.tsx b/src/screens/Messages/JoinRequest.tsx index f2cb6b67dc..bd7a73dade 100644 --- a/src/screens/Messages/JoinRequest.tsx +++ b/src/screens/Messages/JoinRequest.tsx @@ -2,7 +2,7 @@ import {useEffect} from 'react' import {View} from 'react-native' import {ImageBackground} from 'expo-image' import {type ThemeName} from '@bsky.app/alf' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name' diff --git a/src/screens/Messages/components/ChatListItem.tsx b/src/screens/Messages/components/ChatListItem.tsx index 657fa8bae3..f783abc7a0 100644 --- a/src/screens/Messages/components/ChatListItem.tsx +++ b/src/screens/Messages/components/ChatListItem.tsx @@ -4,7 +4,7 @@ import { moderateProfile, type ModerationDecision, type ModerationOpts, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {plural} from '@lingui/core/macro' import {useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/screens/Messages/components/ChatStatusInfo.tsx b/src/screens/Messages/components/ChatStatusInfo.tsx index 1910159a49..afb0e3e299 100644 --- a/src/screens/Messages/components/ChatStatusInfo.tsx +++ b/src/screens/Messages/components/ChatStatusInfo.tsx @@ -1,7 +1,7 @@ import {useCallback, useMemo} from 'react' import {View} from 'react-native' import {LinearGradient} from 'expo-linear-gradient' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name' diff --git a/src/screens/Messages/components/InviteLinkDialog.tsx b/src/screens/Messages/components/InviteLinkDialog.tsx index c30f5dac55..5ac7c1e53a 100644 --- a/src/screens/Messages/components/InviteLinkDialog.tsx +++ b/src/screens/Messages/components/InviteLinkDialog.tsx @@ -1,7 +1,7 @@ import {useState} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useOpenComposer} from '#/lib/hooks/useOpenComposer' diff --git a/src/screens/Messages/components/MessageInputEmbed.tsx b/src/screens/Messages/components/MessageInputEmbed.tsx index e47373af48..0883dfa85e 100644 --- a/src/screens/Messages/components/MessageInputEmbed.tsx +++ b/src/screens/Messages/components/MessageInputEmbed.tsx @@ -1,8 +1,8 @@ import {useCallback, useEffect, useMemo, useState} from 'react' import {LayoutAnimation, View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {moderatePost} from '@bsky.app/sdk/moderation' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {moderatePost} from '@bsky/sdk/moderation' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {Trans, useLingui} from '@lingui/react/macro' import {type RouteProp, useNavigation, useRoute} from '@react-navigation/native' diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx index 586809c7a2..056ff2f76c 100644 --- a/src/screens/Messages/components/MessagesList.tsx +++ b/src/screens/Messages/components/MessagesList.tsx @@ -24,7 +24,7 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context' import {scheduleOnRN} from 'react-native-worklets' import {type $Typed} from '@atproto/lex' import {useScrollEdgeEffectRef} from '@bsky.app/expo-scroll-edge-effect' -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback' import {mergeRefs} from '#/lib/merge-refs' diff --git a/src/screens/Messages/components/MessagesListInfoPanel.tsx b/src/screens/Messages/components/MessagesListInfoPanel.tsx index e0e5545336..4e7eb43a2d 100644 --- a/src/screens/Messages/components/MessagesListInfoPanel.tsx +++ b/src/screens/Messages/components/MessagesListInfoPanel.tsx @@ -1,5 +1,5 @@ import {View} from 'react-native' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' diff --git a/src/screens/Moderation/index.tsx b/src/screens/Moderation/index.tsx index 416390f075..1f612d95a8 100644 --- a/src/screens/Moderation/index.tsx +++ b/src/screens/Moderation/index.tsx @@ -1,6 +1,6 @@ import {Fragment, useCallback} from 'react' import {Linking, View} from 'react-native' -import {LABELS} from '@bsky.app/sdk/moderation' +import {LABELS} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/Onboarding/StepFinished/index.tsx b/src/screens/Onboarding/StepFinished/index.tsx index 9eb22efc70..f90e7ddcd4 100644 --- a/src/screens/Onboarding/StepFinished/index.tsx +++ b/src/screens/Onboarding/StepFinished/index.tsx @@ -3,11 +3,7 @@ import {View} from 'react-native' import {TID} from '@atproto/common-web' import {type Un$Typed} from '@atproto/lex' import {type AtUriString, toDatetimeString} from '@atproto/syntax' -import { - overwriteSavedFeeds, - setInterestsPref, - upsertProfile, -} from '@bsky.app/sdk' +import {overwriteSavedFeeds, setInterestsPref, upsertProfile} from '@bsky/sdk' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx index 982ee15611..dc1a89c182 100644 --- a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx +++ b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx @@ -1,6 +1,6 @@ import {useCallback, useEffect, useMemo, useRef, useState} from 'react' import {View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/PostThread/components/LikesStat.tsx b/src/screens/PostThread/components/LikesStat.tsx index afc4a79cad..fab45ab155 100644 --- a/src/screens/PostThread/components/LikesStat.tsx +++ b/src/screens/PostThread/components/LikesStat.tsx @@ -1,6 +1,6 @@ import {View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {makeProfileLink} from '#/lib/routes/links' diff --git a/src/screens/PostThread/components/ThreadItemAnchor.tsx b/src/screens/PostThread/components/ThreadItemAnchor.tsx index 40894999ca..6a1ee4bb55 100644 --- a/src/screens/PostThread/components/ThreadItemAnchor.tsx +++ b/src/screens/PostThread/components/ThreadItemAnchor.tsx @@ -1,7 +1,7 @@ import {memo, useMemo} from 'react' import {Text as RNText, View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback' diff --git a/src/screens/PostThread/components/ThreadItemPost.tsx b/src/screens/PostThread/components/ThreadItemPost.tsx index a3ee448ed9..12fff63012 100644 --- a/src/screens/PostThread/components/ThreadItemPost.tsx +++ b/src/screens/PostThread/components/ThreadItemPost.tsx @@ -1,7 +1,7 @@ import {memo, type ReactNode, useCallback, useMemo, useState} from 'react' import {View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {Trans} from '@lingui/react/macro' import {MAX_POST_LINES} from '#/lib/constants' diff --git a/src/screens/PostThread/components/ThreadItemTreePost.tsx b/src/screens/PostThread/components/ThreadItemTreePost.tsx index 1e20eb5841..6155ae1081 100644 --- a/src/screens/PostThread/components/ThreadItemTreePost.tsx +++ b/src/screens/PostThread/components/ThreadItemTreePost.tsx @@ -1,7 +1,7 @@ import {memo, useCallback, useMemo, useState} from 'react' import {View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {Trans} from '@lingui/react/macro' import {MAX_POST_LINES} from '#/lib/constants' diff --git a/src/screens/Profile/Header/DisplayName.tsx b/src/screens/Profile/Header/DisplayName.tsx index b9a0fca221..a0f3e7960c 100644 --- a/src/screens/Profile/Header/DisplayName.tsx +++ b/src/screens/Profile/Header/DisplayName.tsx @@ -1,5 +1,5 @@ import {View} from 'react-native' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {sanitizeDisplayName} from '#/lib/strings/display-names' import {sanitizeHandle} from '#/lib/strings/handles' diff --git a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx index d5341e2ad7..c800d0ace3 100644 --- a/src/screens/Profile/Header/ProfileHeaderLabeler.tsx +++ b/src/screens/Profile/Header/ProfileHeaderLabeler.tsx @@ -1,7 +1,7 @@ import {memo, useCallback, useMemo, useState} from 'react' import {View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' -import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' +import {type RichText as RichTextAPI} from '@bsky/sdk/richtext' import {msg, plural} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Plural, Trans} from '@lingui/react/macro' diff --git a/src/screens/Profile/Header/ProfileHeaderStandard.tsx b/src/screens/Profile/Header/ProfileHeaderStandard.tsx index b8cba7c4ce..f66587c947 100644 --- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx +++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx @@ -4,8 +4,8 @@ import { moderateProfile, type ModerationDecision, type ModerationOpts, -} from '@bsky.app/sdk/moderation' -import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +} from '@bsky/sdk/moderation' +import {type RichText as RichTextAPI} from '@bsky/sdk/richtext' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/Profile/Header/Shell.tsx b/src/screens/Profile/Header/Shell.tsx index 46ea78c9a0..bc1efdbb91 100644 --- a/src/screens/Profile/Header/Shell.tsx +++ b/src/screens/Profile/Header/Shell.tsx @@ -6,7 +6,7 @@ import Animated, { } from 'react-native-reanimated' import {useSafeAreaInsets} from 'react-native-safe-area-context' import {utils} from '@bsky.app/alf' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' diff --git a/src/screens/Profile/Header/index.tsx b/src/screens/Profile/Header/index.tsx index dfd84b3530..c8ebd3c780 100644 --- a/src/screens/Profile/Header/index.tsx +++ b/src/screens/Profile/Header/index.tsx @@ -7,8 +7,8 @@ import Animated, { } from 'react-native-reanimated' import {useSafeAreaInsets} from 'react-native-safe-area-context' import {scheduleOnRN} from 'react-native-worklets' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' -import {type RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' +import {type RichText as RichTextAPI} from '@bsky/sdk/richtext' import {useIsFocused} from '@react-navigation/native' import {sanitizeHandle} from '#/lib/strings/handles' diff --git a/src/screens/Profile/Sections/Labels.tsx b/src/screens/Profile/Sections/Labels.tsx index 649c214acb..6d73429f35 100644 --- a/src/screens/Profile/Sections/Labels.tsx +++ b/src/screens/Profile/Sections/Labels.tsx @@ -4,7 +4,7 @@ import { type InterpretedLabelValueDefinition, interpretLabelValueDefinitions, type ModerationOpts, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/ProfileList/components/Header.tsx b/src/screens/ProfileList/components/Header.tsx index 8335cf4851..98059c37de 100644 --- a/src/screens/ProfileList/components/Header.tsx +++ b/src/screens/ProfileList/components/Header.tsx @@ -1,6 +1,6 @@ import {useMemo} from 'react' import {View} from 'react-native' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/ProfileList/index.tsx b/src/screens/ProfileList/index.tsx index f91e2fe896..c898663c8f 100644 --- a/src/screens/ProfileList/index.tsx +++ b/src/screens/ProfileList/index.tsx @@ -2,7 +2,7 @@ import {useCallback, useMemo, useRef, useState} from 'react' import {View} from 'react-native' import {useAnimatedRef} from 'react-native-reanimated' import {AtUri} from '@atproto/syntax' -import {moderateUserList, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateUserList, type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/Search/components/SearchHistory.tsx b/src/screens/Search/components/SearchHistory.tsx index 4a23cf4956..b2b24b58a9 100644 --- a/src/screens/Search/components/SearchHistory.tsx +++ b/src/screens/Search/components/SearchHistory.tsx @@ -1,5 +1,5 @@ import {ScrollView, View} from 'react-native' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {createHitslop} from '#/lib/constants' diff --git a/src/screens/Search/components/SearchProfileCard.tsx b/src/screens/Search/components/SearchProfileCard.tsx index b848739ed3..bd39dc9b4e 100644 --- a/src/screens/Search/components/SearchProfileCard.tsx +++ b/src/screens/Search/components/SearchProfileCard.tsx @@ -1,6 +1,6 @@ import {useCallback} from 'react' import {View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/screens/Search/components/StarterPackCard.tsx b/src/screens/Search/components/StarterPackCard.tsx index eff60a02a4..246100c13d 100644 --- a/src/screens/Search/components/StarterPackCard.tsx +++ b/src/screens/Search/components/StarterPackCard.tsx @@ -1,6 +1,6 @@ import {useState} from 'react' import {View} from 'react-native' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {moderateProfile} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx index ad8a8b8a72..545cc0d231 100644 --- a/src/screens/Search/modules/ExploreSuggestedAccounts.tsx +++ b/src/screens/Search/modules/ExploreSuggestedAccounts.tsx @@ -1,6 +1,6 @@ import {memo, useEffect} from 'react' import {View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {type InfiniteData} from '@tanstack/react-query' diff --git a/src/screens/Search/modules/ExploreTrendingTopics.tsx b/src/screens/Search/modules/ExploreTrendingTopics.tsx index c8e0ee20ec..6bbb6e1e54 100644 --- a/src/screens/Search/modules/ExploreTrendingTopics.tsx +++ b/src/screens/Search/modules/ExploreTrendingTopics.tsx @@ -1,8 +1,8 @@ import {useMemo} from 'react' import {Pressable, View} from 'react-native' import {Image} from 'expo-image' -import {moderateProfile} from '@bsky.app/sdk/moderation' -import {RichText as RichTextApi} from '@bsky.app/sdk/richtext' +import {moderateProfile} from '@bsky/sdk/moderation' +import {RichText as RichTextApi} from '@bsky/sdk/richtext' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useModerationOpts} from '#/state/preferences/moderation-opts' diff --git a/src/screens/Settings/FindContactsSettings.tsx b/src/screens/Settings/FindContactsSettings.tsx index 9574c3a759..bc7ef48f8e 100644 --- a/src/screens/Settings/FindContactsSettings.tsx +++ b/src/screens/Settings/FindContactsSettings.tsx @@ -2,7 +2,7 @@ import {useCallback, useEffect, useState} from 'react' import {type ListRenderItemInfo, View} from 'react-native' import * as Contacts from 'expo-contacts' import {type DidString} from '@atproto/syntax' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Plural, Trans} from '@lingui/react/macro' diff --git a/src/screens/Settings/InterestsSettings.tsx b/src/screens/Settings/InterestsSettings.tsx index 351ee60ffc..84589d7481 100644 --- a/src/screens/Settings/InterestsSettings.tsx +++ b/src/screens/Settings/InterestsSettings.tsx @@ -1,6 +1,6 @@ import {useMemo, useState} from 'react' import {type TextStyle, View, type ViewStyle} from 'react-native' -import {setInterestsPref} from '@bsky.app/sdk' +import {setInterestsPref} from '@bsky/sdk' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx b/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx index 0da3356f5e..c91bcf4acc 100644 --- a/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx +++ b/src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx @@ -1,6 +1,6 @@ import {useCallback, useMemo} from 'react' import {type ListRenderItemInfo, Text as RNText, View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {createSanitizedDisplayName} from '#/lib/moderation/create-sanitized-display-name' diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx index fdb77c9908..61af150a99 100644 --- a/src/screens/Settings/Settings.tsx +++ b/src/screens/Settings/Settings.tsx @@ -1,8 +1,8 @@ import {useState} from 'react' import {Alert, LayoutAnimation, Linking, Pressable, View} from 'react-native' import {useReducedMotion} from 'react-native-reanimated' -import {removeNuxs} from '@bsky.app/sdk' -import {moderateProfile} from '@bsky.app/sdk/moderation' +import {removeNuxs} from '@bsky/sdk' +import {moderateProfile} from '@bsky/sdk/moderation' import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' import {type NativeStackScreenProps} from '@react-navigation/native-stack' diff --git a/src/screens/StarterPack/StarterPackLandingScreen.tsx b/src/screens/StarterPack/StarterPackLandingScreen.tsx index a5a7c3c9f6..4e4cf915dd 100644 --- a/src/screens/StarterPack/StarterPackLandingScreen.tsx +++ b/src/screens/StarterPack/StarterPackLandingScreen.tsx @@ -2,7 +2,7 @@ import {useEffect, useState} from 'react' import {Pressable, View} from 'react-native' import Animated, {FadeIn, FadeOut} from 'react-native-reanimated' import {AtUri} from '@atproto/syntax' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/screens/StarterPack/StarterPackScreen.tsx b/src/screens/StarterPack/StarterPackScreen.tsx index b023889300..8115f15287 100644 --- a/src/screens/StarterPack/StarterPackScreen.tsx +++ b/src/screens/StarterPack/StarterPackScreen.tsx @@ -2,8 +2,8 @@ import {useCallback, useEffect, useState} from 'react' import {View} from 'react-native' import {Image} from 'expo-image' import {AtUri} from '@atproto/syntax' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {type ModerationOpts} from '@bsky/sdk/moderation' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Plural, Trans} from '@lingui/react/macro' diff --git a/src/screens/StarterPack/Wizard/StepFeeds.tsx b/src/screens/StarterPack/Wizard/StepFeeds.tsx index 788f740765..741c8622c6 100644 --- a/src/screens/StarterPack/Wizard/StepFeeds.tsx +++ b/src/screens/StarterPack/Wizard/StepFeeds.tsx @@ -1,7 +1,7 @@ import {useState} from 'react' import {type ListRenderItemInfo, View} from 'react-native' import {KeyboardAwareScrollView} from 'react-native-keyboard-controller' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {Trans} from '@lingui/react/macro' import {DISCOVER_FEED_URI} from '#/lib/constants' diff --git a/src/screens/StarterPack/Wizard/StepProfiles.tsx b/src/screens/StarterPack/Wizard/StepProfiles.tsx index 45e52fa14b..3ba167e856 100644 --- a/src/screens/StarterPack/Wizard/StepProfiles.tsx +++ b/src/screens/StarterPack/Wizard/StepProfiles.tsx @@ -1,7 +1,7 @@ import {useState} from 'react' import {type ListRenderItemInfo, View} from 'react-native' import {KeyboardAwareScrollView} from 'react-native-keyboard-controller' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {Trans} from '@lingui/react/macro' import {useA11y} from '#/state/a11y' diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx index fd6c499584..d1abb10900 100644 --- a/src/screens/StarterPack/Wizard/index.tsx +++ b/src/screens/StarterPack/Wizard/index.tsx @@ -4,7 +4,7 @@ import {KeyboardAwareScrollView} from 'react-native-keyboard-controller' import {useSafeAreaInsets} from 'react-native-safe-area-context' import {Image} from 'expo-image' import {AtUri} from '@atproto/syntax' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Plural, Trans} from '@lingui/react/macro' diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx index 0f8f8d1a39..0b6fd3aba0 100644 --- a/src/screens/VideoFeed/index.tsx +++ b/src/screens/VideoFeed/index.tsx @@ -26,8 +26,8 @@ import {Image, type ImageStyle} from 'expo-image' import {LinearGradient} from 'expo-linear-gradient' import {createVideoPlayer, type VideoPlayer, VideoView} from 'expo-video' import {AtUri} from '@atproto/syntax' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {type ModerationDecision} from '@bsky/sdk/moderation' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {Trans, useLingui} from '@lingui/react/macro' import { type RouteProp, diff --git a/src/state/birthdate.ts b/src/state/birthdate.ts index 8146836190..6dec3afb1c 100644 --- a/src/state/birthdate.ts +++ b/src/state/birthdate.ts @@ -1,5 +1,5 @@ import {useMemo} from 'react' -import {setPersonalDetails} from '@bsky.app/sdk' +import {setPersonalDetails} from '@bsky/sdk' import {useMutation, useQueryClient} from '@tanstack/react-query' import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings' diff --git a/src/state/preferences/label-defs.tsx b/src/state/preferences/label-defs.tsx index 8000bd231c..f60c485656 100644 --- a/src/state/preferences/label-defs.tsx +++ b/src/state/preferences/label-defs.tsx @@ -1,5 +1,5 @@ import {createContext, useContext} from 'react' -import {type InterpretedLabelValueDefinition} from '@bsky.app/sdk/moderation' +import {type InterpretedLabelValueDefinition} from '@bsky/sdk/moderation' import {type app} from '#/lexicons' import {useLabelDefinitionsQuery} from '../queries/preferences' diff --git a/src/state/preferences/moderation-opts.tsx b/src/state/preferences/moderation-opts.tsx index a2575c9a50..72006e1bf2 100644 --- a/src/state/preferences/moderation-opts.tsx +++ b/src/state/preferences/moderation-opts.tsx @@ -1,6 +1,6 @@ import {createContext, useContext, useMemo} from 'react' import {Client} from '@atproto/lex' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {useHiddenPosts, useLabelDefinitions} from '#/state/preferences' import {DEFAULT_LOGGED_OUT_LABEL_PREFERENCES} from '#/state/queries/preferences/const' diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts index cdb2584803..b84b5fabdd 100644 --- a/src/state/queries/actor-autocomplete.ts +++ b/src/state/queries/actor-autocomplete.ts @@ -1,5 +1,5 @@ import {useCallback} from 'react' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' import {keepPreviousData, useQuery, useQueryClient} from '@tanstack/react-query' import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation' diff --git a/src/state/queries/explore-feed-previews.tsx b/src/state/queries/explore-feed-previews.tsx index 0977fdcbdc..efe331af18 100644 --- a/src/state/queries/explore-feed-previews.tsx +++ b/src/state/queries/explore-feed-previews.tsx @@ -1,6 +1,6 @@ import {useMemo, useRef} from 'react' import {AtUri} from '@atproto/syntax' -import {moderatePost} from '@bsky.app/sdk/moderation' +import {moderatePost} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import { diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts index c0ace8f911..850f9dbaa6 100644 --- a/src/state/queries/feed.ts +++ b/src/state/queries/feed.ts @@ -1,7 +1,7 @@ import {useCallback, useEffect, useMemo, useRef} from 'react' import {AtUri, type AtUriString} from '@atproto/syntax' -import {moderateFeedGenerator} from '@bsky.app/sdk/moderation' -import {RichText} from '@bsky.app/sdk/richtext' +import {moderateFeedGenerator} from '@bsky/sdk/moderation' +import {RichText} from '@bsky/sdk/richtext' import {t} from '@lingui/core/macro' import { type InfiniteData, diff --git a/src/state/queries/labeler.ts b/src/state/queries/labeler.ts index 3fd14cc5fc..6d26c92c57 100644 --- a/src/state/queries/labeler.ts +++ b/src/state/queries/labeler.ts @@ -1,5 +1,5 @@ import {type DidString} from '@atproto/syntax' -import {addLabeler, removeLabeler} from '@bsky.app/sdk' +import {addLabeler, removeLabeler} from '@bsky/sdk' import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query' import {z} from 'zod' diff --git a/src/state/queries/like.ts b/src/state/queries/like.ts index 2f626cc428..b8642a45a1 100644 --- a/src/state/queries/like.ts +++ b/src/state/queries/like.ts @@ -1,5 +1,5 @@ import {type AtUriString} from '@atproto/syntax' -import {deleteLike, like} from '@bsky.app/sdk' +import {deleteLike, like} from '@bsky/sdk' import {useMutation} from '@tanstack/react-query' import {usePdsClient} from '#/state/session' diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts index 85efd85b15..bd29d578dc 100644 --- a/src/state/queries/list.ts +++ b/src/state/queries/list.ts @@ -5,7 +5,7 @@ import { muteActorList, unblockActorList, unmuteActorList, -} from '@bsky.app/sdk' +} from '@bsky/sdk' import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query' import chunk from 'lodash.chunk' diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts index b44abe44a2..978c363df5 100644 --- a/src/state/queries/notifications/feed.ts +++ b/src/state/queries/notifications/feed.ts @@ -18,7 +18,7 @@ import {useCallback, useEffect, useMemo, useRef} from 'react' import {AtUri} from '@atproto/syntax' -import {moderatePost} from '@bsky.app/sdk/moderation' +import {moderatePost} from '@bsky/sdk/moderation' import { type InfiniteData, type QueryClient, diff --git a/src/state/queries/notifications/util.ts b/src/state/queries/notifications/util.ts index 83a028423b..fad64582da 100644 --- a/src/state/queries/notifications/util.ts +++ b/src/state/queries/notifications/util.ts @@ -4,7 +4,7 @@ import { hasMutedWord, moderateNotification, type ModerationOpts, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {type QueryClient} from '@tanstack/react-query' import chunk from 'lodash.chunk' diff --git a/src/state/queries/nuxs/index.ts b/src/state/queries/nuxs/index.ts index d8c9e71924..69ab7691a4 100644 --- a/src/state/queries/nuxs/index.ts +++ b/src/state/queries/nuxs/index.ts @@ -1,4 +1,4 @@ -import {removeNuxs, upsertNux} from '@bsky.app/sdk' +import {removeNuxs, upsertNux} from '@bsky/sdk' import {useMutation, useQueryClient} from '@tanstack/react-query' import {type AppNux, type Nux} from '#/state/queries/nuxs/definitions' diff --git a/src/state/queries/nuxs/util.ts b/src/state/queries/nuxs/util.ts index 973b46f0dc..8482f47638 100644 --- a/src/state/queries/nuxs/util.ts +++ b/src/state/queries/nuxs/util.ts @@ -1,4 +1,4 @@ -import {nuxSchema} from '@bsky.app/sdk/utils' +import {nuxSchema} from '@bsky/sdk/utils' import { type AppNux, diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts index e8f5b5ee4a..95af63b185 100644 --- a/src/state/queries/post-feed.ts +++ b/src/state/queries/post-feed.ts @@ -6,7 +6,7 @@ import { moderatePost, type ModerationDecision, type ModerationPrefs, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import { type InfiniteData, type QueryClient, diff --git a/src/state/queries/post-interaction-settings.ts b/src/state/queries/post-interaction-settings.ts index 45d964f435..6eae5c7afa 100644 --- a/src/state/queries/post-interaction-settings.ts +++ b/src/state/queries/post-interaction-settings.ts @@ -1,4 +1,4 @@ -import {setPostInteractionSettings} from '@bsky.app/sdk' +import {setPostInteractionSettings} from '@bsky/sdk' import {useMutation, useQueryClient} from '@tanstack/react-query' import {preferencesQueryKey} from '#/state/queries/preferences' diff --git a/src/state/queries/post.ts b/src/state/queries/post.ts index 73191c83ee..49dfdf0998 100644 --- a/src/state/queries/post.ts +++ b/src/state/queries/post.ts @@ -1,7 +1,7 @@ import {useCallback} from 'react' import {type Client} from '@atproto/lex' import {AtUri, type AtUriString, type HandleString} from '@atproto/syntax' -import {deleteLike, deletePost, deleteRepost, like, repost} from '@bsky.app/sdk' +import {deleteLike, deletePost, deleteRepost, like, repost} from '@bsky/sdk' import { type QueryClient, useMutation, diff --git a/src/state/queries/preferences/const.ts b/src/state/queries/preferences/const.ts index 81b50fffd0..6ec2418e18 100644 --- a/src/state/queries/preferences/const.ts +++ b/src/state/queries/preferences/const.ts @@ -1,4 +1,4 @@ -import {DEFAULT_LABEL_SETTINGS} from '@bsky.app/sdk/moderation' +import {DEFAULT_LABEL_SETTINGS} from '@bsky/sdk/moderation' import { type ThreadViewPreferences, diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts index f3bb37d1a0..912a87a1ba 100644 --- a/src/state/queries/preferences/index.ts +++ b/src/state/queries/preferences/index.ts @@ -20,8 +20,8 @@ import { updateMutedWord, updateSavedFeeds, upsertMutedWords, -} from '@bsky.app/sdk' -import {type LabelPreference} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk' +import {type LabelPreference} from '@bsky/sdk/moderation' import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query' import {PROD_DEFAULT_FEED} from '#/lib/constants' diff --git a/src/state/queries/preferences/moderation.ts b/src/state/queries/preferences/moderation.ts index f7d237995e..36f17a4f31 100644 --- a/src/state/queries/preferences/moderation.ts +++ b/src/state/queries/preferences/moderation.ts @@ -1,6 +1,6 @@ import {useMemo} from 'react' import {Client} from '@atproto/lex' -import {interpretLabelValueDefinitions} from '@bsky.app/sdk/moderation' +import {interpretLabelValueDefinitions} from '@bsky/sdk/moderation' import {isNonConfigurableModerationAuthority} from '#/state/session/additional-moderation-authorities' import {useLabelersDetailedInfoQuery} from '../labeler' diff --git a/src/state/queries/preferences/types.ts b/src/state/queries/preferences/types.ts index f93ca955a4..7ade79b834 100644 --- a/src/state/queries/preferences/types.ts +++ b/src/state/queries/preferences/types.ts @@ -1,4 +1,4 @@ -import {type BskyFeedViewPreference, type BskyPreferences} from '@bsky.app/sdk' +import {type BskyFeedViewPreference, type BskyPreferences} from '@bsky/sdk' export type UsePreferencesQueryResponse = Omit< BskyPreferences, diff --git a/src/state/queries/profile-feedgens.ts b/src/state/queries/profile-feedgens.ts index 79309b1328..dffc869512 100644 --- a/src/state/queries/profile-feedgens.ts +++ b/src/state/queries/profile-feedgens.ts @@ -1,5 +1,5 @@ import {type DidString} from '@atproto/syntax' -import {moderateFeedGenerator} from '@bsky.app/sdk/moderation' +import {moderateFeedGenerator} from '@bsky/sdk/moderation' import { type InfiniteData, type QueryKey, diff --git a/src/state/queries/profile-lists.ts b/src/state/queries/profile-lists.ts index 8f1087c245..0d466aff29 100644 --- a/src/state/queries/profile-lists.ts +++ b/src/state/queries/profile-lists.ts @@ -1,5 +1,5 @@ import {type DidString} from '@atproto/syntax' -import {moderateUserList} from '@bsky.app/sdk/moderation' +import {moderateUserList} from '@bsky/sdk/moderation' import { type InfiniteData, type QueryKey, diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts index fb3f467743..dcfcba82bb 100644 --- a/src/state/queries/profile.ts +++ b/src/state/queries/profile.ts @@ -13,7 +13,7 @@ import { muteActor, unmuteActor, upsertProfile, -} from '@bsky.app/sdk' +} from '@bsky/sdk' import { type InfiniteData, keepPreviousData, @@ -548,7 +548,6 @@ function useProfileMuteRepostsMutation() { mutationFn: async ({did}: {did: DidString}) => { await appviewClient.call(muteActor, { actor: did, - // @ts-expect-error missing from this SDK version, remove this onlyReposts: true, }) }, diff --git a/src/state/queries/search-posts-v2.ts b/src/state/queries/search-posts-v2.ts index e9a1178009..acb69f57d4 100644 --- a/src/state/queries/search-posts-v2.ts +++ b/src/state/queries/search-posts-v2.ts @@ -1,6 +1,6 @@ import {useCallback, useMemo, useRef} from 'react' import {AtUri} from '@atproto/syntax' -import {moderatePost} from '@bsky.app/sdk/moderation' +import {moderatePost} from '@bsky/sdk/moderation' import { type InfiniteData, type QueryClient, diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts index dd3ff1a9fe..7dcb76e706 100644 --- a/src/state/queries/starter-packs.ts +++ b/src/state/queries/starter-packs.ts @@ -1,6 +1,6 @@ import {type Client} from '@atproto/lex' import {AtUri, type AtUriString, toDatetimeString} from '@atproto/syntax' -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import { type QueryClient, useMutation, diff --git a/src/state/queries/trending/useGetTrendsQuery.ts b/src/state/queries/trending/useGetTrendsQuery.ts index 5ba9b4d4b2..fabeccd478 100644 --- a/src/state/queries/trending/useGetTrendsQuery.ts +++ b/src/state/queries/trending/useGetTrendsQuery.ts @@ -1,5 +1,5 @@ import {useCallback, useMemo} from 'react' -import {hasMutedWord} from '@bsky.app/sdk/moderation' +import {hasMutedWord} from '@bsky/sdk/moderation' import {useQuery} from '@tanstack/react-query' import { diff --git a/src/state/queries/usePostThread/traversal.ts b/src/state/queries/usePostThread/traversal.ts index 107697f76f..c7df88a0e4 100644 --- a/src/state/queries/usePostThread/traversal.ts +++ b/src/state/queries/usePostThread/traversal.ts @@ -1,4 +1,4 @@ -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import { type ApiThreadItem, diff --git a/src/state/queries/usePostThread/types.ts b/src/state/queries/usePostThread/types.ts index 2c2548ff50..e5ead90051 100644 --- a/src/state/queries/usePostThread/types.ts +++ b/src/state/queries/usePostThread/types.ts @@ -1,4 +1,4 @@ -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {type app} from '#/lexicons' diff --git a/src/state/queries/usePostThread/views.ts b/src/state/queries/usePostThread/views.ts index d03f49219c..a5661ae835 100644 --- a/src/state/queries/usePostThread/views.ts +++ b/src/state/queries/usePostThread/views.ts @@ -1,6 +1,6 @@ import {type $Typed} from '@atproto/lex' import {AtUri} from '@atproto/syntax' -import {moderatePost, type ModerationOpts} from '@bsky.app/sdk/moderation' +import {moderatePost, type ModerationOpts} from '@bsky/sdk/moderation' import {makeProfileLink} from '#/lib/routes/links' import { diff --git a/src/state/session/create-account.ts b/src/state/session/create-account.ts index 618ab1aa7a..e2337b30c3 100644 --- a/src/state/session/create-account.ts +++ b/src/state/session/create-account.ts @@ -2,11 +2,7 @@ import {TID} from '@atproto/common-web' import {type Client} from '@atproto/lex' import {PasswordSession} from '@atproto/lex-password-session' import {toDatetimeString} from '@atproto/syntax' -import { - overwriteSavedFeeds, - setPersonalDetails, - upsertProfile, -} from '@bsky.app/sdk' +import {overwriteSavedFeeds, setPersonalDetails, upsertProfile} from '@bsky/sdk' import {networkRetry} from '#/lib/async/retry' import { diff --git a/src/state/session/moderation.ts b/src/state/session/moderation.ts index c54da1be46..72afe204c2 100644 --- a/src/state/session/moderation.ts +++ b/src/state/session/moderation.ts @@ -1,6 +1,6 @@ import {type Client} from '@atproto/lex' import {type DidString} from '@atproto/syntax' -import {api} from '@bsky.app/sdk' +import {api} from '@bsky/sdk' import {IS_TEST_USER} from '#/lib/constants' import {com} from '#/lexicons' diff --git a/src/state/shell/composer/index.tsx b/src/state/shell/composer/index.tsx index 12e734bf6c..fddf0421e9 100644 --- a/src/state/shell/composer/index.tsx +++ b/src/state/shell/composer/index.tsx @@ -1,5 +1,5 @@ import {createContext, useContext, useMemo, useState} from 'react' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index 7a2a2f5484..08efc5c696 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -46,7 +46,7 @@ import * as FileSystem from 'expo-file-system' import {type ImagePickerAsset} from 'expo-image-picker' import {type Client, type UriString} from '@atproto/lex' import {AtUri, type AtUriString} from '@atproto/syntax' -import {type RichText} from '@bsky.app/sdk/richtext' +import {type RichText} from '@bsky/sdk/richtext' import {plural} from '@lingui/core/macro' import {Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' diff --git a/src/view/com/composer/drafts/state/api.ts b/src/view/com/composer/drafts/state/api.ts index 2260e04bd0..5507460be0 100644 --- a/src/view/com/composer/drafts/state/api.ts +++ b/src/view/com/composer/drafts/state/api.ts @@ -3,7 +3,7 @@ */ import {type UriString} from '@atproto/lex' import {AtUri} from '@atproto/syntax' -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import {nanoid} from 'nanoid/non-secure' import {type LinkResolvers, resolveLink} from '#/lib/api/resolve' diff --git a/src/view/com/composer/select-language/SuggestedLanguage.tsx b/src/view/com/composer/select-language/SuggestedLanguage.tsx index 71a45ec796..56bca076e1 100644 --- a/src/view/com/composer/select-language/SuggestedLanguage.tsx +++ b/src/view/com/composer/select-language/SuggestedLanguage.tsx @@ -5,7 +5,7 @@ import { guessLanguageAsync, type LanguageResult, } from '@bsky.app/expo-guess-language' -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import {Trans, useLingui} from '@lingui/react/macro' import debounce from 'lodash.debounce' diff --git a/src/view/com/composer/state/composer.ts b/src/view/com/composer/state/composer.ts index ad3e5f4df6..a7fd4f1e1b 100644 --- a/src/view/com/composer/state/composer.ts +++ b/src/view/com/composer/state/composer.ts @@ -1,7 +1,7 @@ import {type ImagePickerAsset} from 'expo-image-picker' import {type UriString} from '@atproto/lex' import {type AtUriString, toDatetimeString} from '@atproto/syntax' -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import {nanoid} from 'nanoid/non-secure' import {type VideoTelemetry} from '#/lib/media/video/telemetry' diff --git a/src/view/com/composer/text-input/TextInput.tsx b/src/view/com/composer/text-input/TextInput.tsx index d230b01545..d2d108b570 100644 --- a/src/view/com/composer/text-input/TextInput.tsx +++ b/src/view/com/composer/text-input/TextInput.tsx @@ -12,7 +12,7 @@ import { View, } from 'react-native' import {type PasteEventPayload, TextInputWrapper} from 'expo-paste-input' -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import {useLingui} from '@lingui/react/macro' import {IMAGE_SIZE_CONFIG_POSTS} from '#/lib/constants' diff --git a/src/view/com/composer/text-input/TextInput.types.ts b/src/view/com/composer/text-input/TextInput.types.ts index e60432b41e..490472f0a4 100644 --- a/src/view/com/composer/text-input/TextInput.types.ts +++ b/src/view/com/composer/text-input/TextInput.types.ts @@ -1,5 +1,5 @@ import {type TextInput} from 'react-native' -import {type RichText} from '@bsky.app/sdk/richtext' +import {type RichText} from '@bsky/sdk/richtext' export type TextInputRef = { focus: () => void diff --git a/src/view/com/composer/text-input/TextInput.web.tsx b/src/view/com/composer/text-input/TextInput.web.tsx index f75d60f4bd..79f0c2db46 100644 --- a/src/view/com/composer/text-input/TextInput.web.tsx +++ b/src/view/com/composer/text-input/TextInput.web.tsx @@ -8,7 +8,7 @@ import { } from 'react' import {StyleSheet, View} from 'react-native' import Animated, {FadeIn, FadeOut} from 'react-native-reanimated' -import {RichText} from '@bsky.app/sdk/richtext' +import {RichText} from '@bsky/sdk/richtext' import {Trans} from '@lingui/react/macro' import {getSchema} from '@tiptap/core' import {Document} from '@tiptap/extension-document' diff --git a/src/view/com/composer/text-input/text-input-util.ts b/src/view/com/composer/text-input/text-input-util.ts index 998d7074d9..6f6d2e46d3 100644 --- a/src/view/com/composer/text-input/text-input-util.ts +++ b/src/view/com/composer/text-input/text-input-util.ts @@ -1,4 +1,4 @@ -import {type RichText} from '@bsky.app/sdk/richtext' +import {type RichText} from '@bsky/sdk/richtext' import {type app} from '#/lexicons' diff --git a/src/view/com/composer/text-input/web/Autocomplete.tsx b/src/view/com/composer/text-input/web/Autocomplete.tsx index 945ce59adc..21d8e37b59 100644 --- a/src/view/com/composer/text-input/web/Autocomplete.tsx +++ b/src/view/com/composer/text-input/web/Autocomplete.tsx @@ -1,6 +1,6 @@ import {forwardRef, useEffect, useImperativeHandle, useState} from 'react' import {Pressable, View} from 'react-native' -import {type ModerationOpts} from '@bsky.app/sdk/moderation' +import {type ModerationOpts} from '@bsky/sdk/moderation' import {Trans} from '@lingui/react/macro' import {ReactRenderer} from '@tiptap/react' import { diff --git a/src/view/com/composer/text-input/web/LinkDecorator.ts b/src/view/com/composer/text-input/web/LinkDecorator.ts index bcb81b2cf5..d9a4c51ca3 100644 --- a/src/view/com/composer/text-input/web/LinkDecorator.ts +++ b/src/view/com/composer/text-input/web/LinkDecorator.ts @@ -14,7 +14,7 @@ * the facet-set. */ -import {URL_REGEX} from '@bsky.app/sdk/richtext' +import {URL_REGEX} from '@bsky/sdk/richtext' import {Mark} from '@tiptap/core' import {type Node as ProsemirrorNode} from '@tiptap/pm/model' import {Plugin, PluginKey} from '@tiptap/pm/state' diff --git a/src/view/com/composer/text-input/web/TagDecorator.ts b/src/view/com/composer/text-input/web/TagDecorator.ts index 34f6396abb..eca041f06b 100644 --- a/src/view/com/composer/text-input/web/TagDecorator.ts +++ b/src/view/com/composer/text-input/web/TagDecorator.ts @@ -18,7 +18,7 @@ import { CASHTAG_REGEX, TAG_REGEX, TRAILING_PUNCTUATION_REGEX, -} from '@bsky.app/sdk/richtext' +} from '@bsky/sdk/richtext' import {Mark} from '@tiptap/core' import {type Node as ProsemirrorNode} from '@tiptap/pm/model' import {Plugin, PluginKey} from '@tiptap/pm/state' diff --git a/src/view/com/notifications/NotificationFeedItem.tsx b/src/view/com/notifications/NotificationFeedItem.tsx index d4d4fe52b3..0d56dfb873 100644 --- a/src/view/com/notifications/NotificationFeedItem.tsx +++ b/src/view/com/notifications/NotificationFeedItem.tsx @@ -14,7 +14,7 @@ import { moderateProfile, type ModerationDecision, type ModerationOpts, -} from '@bsky.app/sdk/moderation' +} from '@bsky/sdk/moderation' import {plural} from '@lingui/core/macro' import {Plural, Trans, useLingui} from '@lingui/react/macro' import {useNavigation} from '@react-navigation/native' diff --git a/src/view/com/post-thread/PostQuotes.tsx b/src/view/com/post-thread/PostQuotes.tsx index 459bbc525e..7bd63d1992 100644 --- a/src/view/com/post-thread/PostQuotes.tsx +++ b/src/view/com/post-thread/PostQuotes.tsx @@ -1,5 +1,5 @@ import {useCallback, useState} from 'react' -import {moderatePost, type ModerationDecision} from '@bsky.app/sdk/moderation' +import {moderatePost, type ModerationDecision} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx index f9369ce0d4..94398778e8 100644 --- a/src/view/com/post/Post.tsx +++ b/src/view/com/post/Post.tsx @@ -1,8 +1,8 @@ import {useCallback, useMemo, useState} from 'react' import {type StyleProp, StyleSheet, View, type ViewStyle} from 'react-native' import {AtUri} from '@atproto/syntax' -import {moderatePost, type ModerationDecision} from '@bsky.app/sdk/moderation' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {moderatePost, type ModerationDecision} from '@bsky/sdk/moderation' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {useQueryClient} from '@tanstack/react-query' import {MAX_POST_LINES} from '#/lib/constants' diff --git a/src/view/com/posts/PostFeed.tsx b/src/view/com/posts/PostFeed.tsx index dbda8d0c41..1126ff8a6c 100644 --- a/src/view/com/posts/PostFeed.tsx +++ b/src/view/com/posts/PostFeed.tsx @@ -18,7 +18,7 @@ import { View, type ViewStyle, } from 'react-native' -import {type RichText as RichTextType} from '@bsky.app/sdk/richtext' +import {type RichText as RichTextType} from '@bsky/sdk/richtext' import {useLingui} from '@lingui/react/macro' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/view/com/posts/PostFeedItem.tsx b/src/view/com/posts/PostFeedItem.tsx index cb43274741..c9ed6b603b 100644 --- a/src/view/com/posts/PostFeedItem.tsx +++ b/src/view/com/posts/PostFeedItem.tsx @@ -1,8 +1,8 @@ import {memo, useCallback, useMemo, useState} from 'react' import {StyleSheet, View} from 'react-native' import {AtUri} from '@atproto/syntax' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {type ModerationDecision} from '@bsky/sdk/moderation' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {useQueryClient} from '@tanstack/react-query' import {type ReasonFeedSource} from '#/lib/api/feed/types' diff --git a/src/view/com/posts/PostFeedReason.tsx b/src/view/com/posts/PostFeedReason.tsx index 9e1a043946..54fdbfe465 100644 --- a/src/view/com/posts/PostFeedReason.tsx +++ b/src/view/com/posts/PostFeedReason.tsx @@ -1,5 +1,5 @@ import {StyleSheet, View} from 'react-native' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/view/com/util/PostMeta.tsx b/src/view/com/util/PostMeta.tsx index 2c83017c96..d750cc408d 100644 --- a/src/view/com/util/PostMeta.tsx +++ b/src/view/com/util/PostMeta.tsx @@ -1,6 +1,6 @@ import {memo, useCallback} from 'react' import {type StyleProp, View, type ViewStyle} from 'react-native' -import {type ModerationDecision} from '@bsky.app/sdk/moderation' +import {type ModerationDecision} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {useQueryClient} from '@tanstack/react-query' diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx index 06893524f3..be607d1630 100644 --- a/src/view/com/util/UserAvatar.tsx +++ b/src/view/com/util/UserAvatar.tsx @@ -11,7 +11,7 @@ import { } from 'react-native' import Svg, {Circle, Path, Rect} from 'react-native-svg' import {Image as ExpoImage} from 'expo-image' -import {type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationUI} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx index b9d9604d64..5c7cfa4c7c 100644 --- a/src/view/com/util/UserBanner.tsx +++ b/src/view/com/util/UserBanner.tsx @@ -1,7 +1,7 @@ import {useCallback, useState} from 'react' import {Pressable, StyleSheet, View} from 'react-native' import {Image} from 'expo-image' -import {type ModerationUI} from '@bsky.app/sdk/moderation' +import {type ModerationUI} from '@bsky/sdk/moderation' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro' diff --git a/src/view/screens/DebugMod.tsx b/src/view/screens/DebugMod.tsx index 359d61ef85..68eaa95359 100644 --- a/src/view/screens/DebugMod.tsx +++ b/src/view/screens/DebugMod.tsx @@ -10,8 +10,8 @@ import { type ModerationBehavior, type ModerationDecision, type ModerationOpts, -} from '@bsky.app/sdk/moderation' -import {RichText} from '@bsky.app/sdk/richtext' +} from '@bsky/sdk/moderation' +import {RichText} from '@bsky/sdk/richtext' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx index 09eafda0f7..d01ef2cb7b 100644 --- a/src/view/screens/Profile.tsx +++ b/src/view/screens/Profile.tsx @@ -2,8 +2,8 @@ import {useCallback, useEffect, useMemo, useRef, useState} from 'react' import {StyleSheet} from 'react-native' import {SafeAreaView} from 'react-native-safe-area-context' import {ScrollForwarderView} from 'react-native-scroll-forwarder' -import {moderateProfile, type ModerationOpts} from '@bsky.app/sdk/moderation' -import {RichText as RichTextAPI} from '@bsky.app/sdk/richtext' +import {moderateProfile, type ModerationOpts} from '@bsky/sdk/moderation' +import {RichText as RichTextAPI} from '@bsky/sdk/richtext' import {msg} from '@lingui/core/macro' import {useLingui} from '@lingui/react' import {Trans} from '@lingui/react/macro'