diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts --- 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 --- a/lexicons.json +++ b/lexicons.json @@ -726,7 +726,7 @@ "cid": "bafyreidg56eo7zynf6ihz4xb627vwoqf5idnevkmwp7sxc4tijg6xngbu4" }, "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 --- a/lexicons/app/bsky/unspecced/getConfig.json +++ b/lexicons/app/bsky/unspecced/getConfig.json @@ -11,15 +11,10 @@ "schema": { "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 @@ "liveNowConfig": { "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 --- /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 --- /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 --- a/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json +++ b/lexicons/app/bsky/unspecced/getPopularFeedGenerators.json @@ -14,12 +14,8 @@ "minimum": 1, "maximum": 100, "default": 50 }, - "cursor": { - "type": "string" - }, - "query": { - "type": "string" - } + "cursor": { "type": "string" }, + "query": { "type": "string" } } }, "output": { @@ -28,9 +24,7 @@ "schema": { "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 --- /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 --- /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 --- /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 --- a/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json +++ b/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json @@ -19,9 +19,7 @@ "minimum": 1, "maximum": 100, "default": 50 }, - "cursor": { - "type": "string" - }, + "cursor": { "type": "string" }, "relativeToDid": { "type": "string", "format": "did", @@ -35,9 +33,7 @@ "schema": { "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 --- a/lexicons/app/bsky/unspecced/getTaggedSuggestions.json +++ b/lexicons/app/bsky/unspecced/getTaggedSuggestions.json @@ -30,17 +30,12 @@ "suggestion": { "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 --- a/lexicons/app/bsky/unspecced/getTrendsSkeleton.json +++ b/lexicons/app/bsky/unspecced/getTrendsSkeleton.json @@ -33,6 +33,10 @@ "items": { "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 --- a/lexicons/app/bsky/unspecced/initAgeAssurance.json +++ b/lexicons/app/bsky/unspecced/initAgeAssurance.json @@ -34,15 +34,9 @@ "ref": "app.bsky.unspecced.defs#ageAssuranceState" } }, "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 --- a/lexicons/app/bsky/unspecced/searchActorsSkeleton.json +++ b/lexicons/app/bsky/unspecced/searchActorsSkeleton.json @@ -40,9 +40,7 @@ "schema": { "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 --- a/lexicons/app/bsky/unspecced/searchPostsSkeleton.json +++ b/lexicons/app/bsky/unspecced/searchPostsSkeleton.json @@ -83,9 +83,7 @@ "schema": { "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 --- a/lexicons/app/bsky/video/defs.json +++ b/lexicons/app/bsky/video/defs.json @@ -26,6 +26,13 @@ "state": { "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 --- a/package.json +++ b/package.json @@ -114,11 +114,11 @@ "@bsky.app/expo-scroll-edge-effect": "^0.1.9", "@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 @@ "^@ipld/dag-cbor$": "/node_modules/@ipld/dag-cbor/src/index.js", "^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 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -284,9 +284,6 @@ version: 0.3.2(83e0f64f4281e4798012214ad5b2d72d) '@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 @@ version: 0.3.6(83e0f64f4281e4798012214ad5b2d72d) '@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 @@ -1770,6 +1770,12 @@ peerDependencies: expo: '*' 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==} @@ -4494,12 +4500,6 @@ 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 @@ expo: 54.0.35(@babel/core@7.29.0(supports-color@8.1.1))(react-native-webview@13.15.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))(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)(supports-color@8.1.1) 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 @@ -14039,13 +14046,6 @@ bser@2.1.1: 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: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/components/AvatarBubbles.tsx +++ b/src/components/AvatarBubbles.tsx @@ -8,7 +8,7 @@ useSharedValue, 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/components/PostControls/PostMenu/PostMenuItems.tsx +++ b/src/components/PostControls/PostMenu/PostMenuItems.tsx @@ -7,7 +7,7 @@ type ViewStyle, } 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/components/ProfileCard.tsx +++ b/src/components/ProfileCard.tsx @@ -6,8 +6,8 @@ type TextStyle, 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/components/StarterPack/Wizard/WizardListCard.tsx +++ b/src/components/StarterPack/Wizard/WizardListCard.tsx @@ -4,7 +4,7 @@ moderateFeedGenerator, 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/components/dialogs/SearchablePeopleList.tsx +++ b/src/components/dialogs/SearchablePeopleList.tsx @@ -7,7 +7,7 @@ useRef, 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/components/dms/InitiateChatFlow.tsx +++ b/src/components/dms/InitiateChatFlow.tsx @@ -7,7 +7,7 @@ useRef, 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 --- 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 --- a/src/components/dms/MessageItem.tsx +++ b/src/components/dms/MessageItem.tsx @@ -22,8 +22,8 @@ withTiming, 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/components/moderation/ContentHider.tsx +++ b/src/components/moderation/ContentHider.tsx @@ -5,7 +5,7 @@ type StyleProp, 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 --- 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 --- 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 --- 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 --- 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 --- a/src/components/moderation/PostHider.tsx +++ b/src/components/moderation/PostHider.tsx @@ -7,7 +7,7 @@ StyleSheet, 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 --- 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 --- 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 --- a/src/components/moderation/ReportDialog/index.tsx +++ b/src/components/moderation/ReportDialog/index.tsx @@ -7,7 +7,7 @@ useRef, 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 --- a/src/components/moderation/ScreenHider.tsx +++ b/src/components/moderation/ScreenHider.tsx @@ -5,7 +5,7 @@ TouchableWithoutFeedback, 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 --- 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 --- 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 --- 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 --- 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 --- a/src/lib/api/index.ts +++ b/src/lib/api/index.ts @@ -5,7 +5,7 @@ type AtUriString, 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 --- 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 --- a/src/lib/moderation.ts +++ b/src/lib/moderation.ts @@ -7,7 +7,7 @@ LABELS, 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/screens/Profile/Header/Shell.tsx +++ b/src/screens/Profile/Header/Shell.tsx @@ -6,7 +6,7 @@ useAnimatedRef, } 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 --- a/src/screens/Profile/Header/index.tsx +++ b/src/screens/Profile/Header/index.tsx @@ -7,8 +7,8 @@ withTiming, } 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/state/queries/list.ts +++ b/src/state/queries/list.ts @@ -5,7 +5,7 @@ blockActorList, 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/state/queries/preferences/index.ts +++ b/src/state/queries/preferences/index.ts @@ -20,8 +20,8 @@ setVerificationPrefs, 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 --- 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 --- 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 --- 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 --- 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 --- a/src/state/queries/profile.ts +++ b/src/state/queries/profile.ts @@ -13,7 +13,7 @@ follow, muteActor, unmuteActor, upsertProfile, -} from '@bsky.app/sdk' +} from '@bsky/sdk' import { type InfiniteData, keepPreviousData, @@ -548,7 +548,6 @@ return useMutation({ 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/src/view/com/composer/drafts/state/api.ts +++ b/src/view/com/composer/drafts/state/api.ts @@ -3,7 +3,7 @@ * Type converters for Draft API - convert between ComposerState and server Draft types. */ 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 --- 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 --- 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 --- a/src/view/com/composer/text-input/TextInput.tsx +++ b/src/view/com/composer/text-input/TextInput.tsx @@ -12,7 +12,7 @@ type TextInputSelectionChangeEvent, 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 --- 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 --- a/src/view/com/composer/text-input/TextInput.web.tsx +++ b/src/view/com/composer/text-input/TextInput.web.tsx @@ -8,7 +8,7 @@ useState, } 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 --- 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 --- 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 --- a/src/view/com/composer/text-input/web/LinkDecorator.ts +++ b/src/view/com/composer/text-input/web/LinkDecorator.ts @@ -14,7 +14,7 @@ * RichText object from TipTap's output and merge their features into * 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 --- 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 --- 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 --- 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 --- 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 --- a/src/view/com/posts/PostFeed.tsx +++ b/src/view/com/posts/PostFeed.tsx @@ -18,7 +18,7 @@ StyleSheet, 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 --- 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 --- 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 --- 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 --- a/src/view/com/util/UserAvatar.tsx +++ b/src/view/com/util/UserAvatar.tsx @@ -11,7 +11,7 @@ type ViewStyle, } 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 --- 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 --- a/src/view/screens/DebugMod.tsx +++ b/src/view/screens/DebugMod.tsx @@ -10,8 +10,8 @@ moderateProfile, 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 --- 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'