diff --git a/package.json b/package.json index 33ef9c1a7..027ec0862 100644 --- a/package.json +++ b/package.json @@ -88,9 +88,9 @@ "dependencies": { "@assembless/react-native-material-you": "1.0.0-beta.4", "@atproto/api": "^0.19.11", - "@atproto/syntax": "0.5.2", "@atproto/oauth-client-browser": "^0.3.41", "@atproto/oauth-client-expo": "^0.0.10", + "@atproto/syntax": "0.5.2", "@bitdrift/react-native": "^0.6.14", "@braintree/sanitize-url": "^6.0.4", "@bsky.app/alf": "^0.1.8", @@ -322,7 +322,7 @@ "swc-loader": "^0.2.7", "ts-plugin-sort-import-suggestions": "^1.0.4", "typescript": "^6.0.3", - "typescript-eslint": "^8.59.0", + "typescript-eslint": "8.59.1-alpha.4", "vite": "^8.0.10", "vite-plugin-commonjs": "^0.10.4", "webpack-bundle-analyzer": "^4.10.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8088221b9..bb615bfe5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -728,8 +728,8 @@ importers: specifier: ^6.0.3 version: 6.0.3 typescript-eslint: - specifier: ^8.59.0 - version: 8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) + specifier: 8.59.1-alpha.4 + version: 8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) vite: specifier: ^8.0.10 version: 8.0.10(@types/node@20.19.39)(esbuild@0.27.7)(jiti@2.6.1)(terser@5.46.2)(yaml@2.8.3) @@ -5451,11 +5451,11 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/eslint-plugin@8.59.0': - resolution: {integrity: sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==} + '@typescript-eslint/eslint-plugin@8.59.1-alpha.4': + resolution: {integrity: sha512-byYju3Fr13gdhCUwbTZ1g9YjfUchbsVzaqTk2Gavxr/BBCvOaKBZVpVbsFgDKJeb4ThBdnOI1KxzC7a1qyeFYg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.59.0 + '@typescript-eslint/parser': ^8.59.1-alpha.4 eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' @@ -5466,8 +5466,8 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/parser@8.59.0': - resolution: {integrity: sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==} + '@typescript-eslint/parser@8.59.1-alpha.4': + resolution: {integrity: sha512-cEEoLwnYJgE6OpdUwpfuhFB01ILgmtEFV1CrenCGUh1v4DKAFQMAVPuLW1bw4qASgNbBaWdSdnY/VxQOtqrzqw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 @@ -5485,6 +5485,12 @@ packages: peerDependencies: typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/project-service@8.59.1-alpha.4': + resolution: {integrity: sha512-DfTAosFACbTSPULivcGRG4DQhnAMY1Vk4rZyDG1vTrQux3SKyDks15K+TQGYcOAlV8+Nr3LwfXZNQDOJBKG9vQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/scope-manager@8.58.2': resolution: {integrity: sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -5493,6 +5499,10 @@ packages: resolution: {integrity: sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/scope-manager@8.59.1-alpha.4': + resolution: {integrity: sha512-zBiIicCDrT8PMoBbjP07F3ISeaa13pEJf3TnN8Fskyg4jZpr/kBxYNntqFZTWURnMf+8P5dmSKFZpq1LF+oKoA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/tsconfig-utils@8.58.2': resolution: {integrity: sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -5505,6 +5515,12 @@ packages: peerDependencies: typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/tsconfig-utils@8.59.1-alpha.4': + resolution: {integrity: sha512-8bxbleDpFwToG6K55YEiaYKGS0wxzyMrW88bjVtsrnRVTyuvsqgifsMPPm8jJ7o0wH38hg5FP/EsLmkiVVxJUQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/type-utils@8.58.2': resolution: {integrity: sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -5512,8 +5528,8 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - '@typescript-eslint/type-utils@8.59.0': - resolution: {integrity: sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==} + '@typescript-eslint/type-utils@8.59.1-alpha.4': + resolution: {integrity: sha512-4h6m2Gt4soxwzHqC5+yzrLEszSOl8zNp9jYCzvbZEtmGLUfjH5gcZDgaxPUoXYszzWExI6pwj9EMwYx3bQqTnQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 @@ -5527,6 +5543,10 @@ packages: resolution: {integrity: sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/types@8.59.1-alpha.4': + resolution: {integrity: sha512-HjcF6fd/V3K3kiOX5tpHBPdqbT32sLL2QyHJk0efVz+uHIkSrUYn0pCHt0TYanR0wf5EPDzBvQpAz6XDUbU52Q==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/typescript-estree@8.58.2': resolution: {integrity: sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -5539,6 +5559,12 @@ packages: peerDependencies: typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/typescript-estree@8.59.1-alpha.4': + resolution: {integrity: sha512-Eqe5rYOIESTtFvBKIkiSaJmVX9kIYC9W9XcNTYOMcpw5TMUHpUcw+Lioy3nn8UBiE4ooWCQgYo+YLbn++arFaw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/utils@8.58.2': resolution: {integrity: sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -5553,6 +5579,13 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/utils@8.59.1-alpha.4': + resolution: {integrity: sha512-6shVr07EMgxQgrTTGkXe6F663nSHf6OzjHjbiFdOWUFVemzgCbgSDuygOKsNNEVWD2uKskBnsLTfmng8DFPGGA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 + typescript: '>=4.8.4 <6.1.0' + '@typescript-eslint/visitor-keys@8.58.2': resolution: {integrity: sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -5561,6 +5594,10 @@ packages: resolution: {integrity: sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/visitor-keys@8.59.1-alpha.4': + resolution: {integrity: sha512-dpyUVPlBGylXXnr4b3eUS2xhMQ/hbjlSElv6uUO5IE2Yej334qQ7SL+gcHdKHrdZytz7nsoNpqq5RRHaXnVlbQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@ungap/structured-clone@1.3.0': resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==} @@ -11613,8 +11650,8 @@ packages: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 typescript: '>=4.8.4 <6.1.0' - typescript-eslint@8.59.0: - resolution: {integrity: sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==} + typescript-eslint@8.59.1-alpha.4: + resolution: {integrity: sha512-KABzKWzRqO+XJL6rH8MkNNqtb2vkBijAQZRSmoQYdQyft/+ueQq89tazoHYgjDKphlQx2Ch2E5dnMQHUfHivhA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 || ^10.0.0 @@ -18727,14 +18764,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/eslint-plugin@8.59.0(@typescript-eslint/parser@8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3))(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)': + '@typescript-eslint/eslint-plugin@8.59.1-alpha.4(@typescript-eslint/parser@8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3))(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) - '@typescript-eslint/scope-manager': 8.59.0 - '@typescript-eslint/type-utils': 8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) - '@typescript-eslint/utils': 8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.59.0 + '@typescript-eslint/parser': 8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) + '@typescript-eslint/scope-manager': 8.59.1-alpha.4 + '@typescript-eslint/type-utils': 8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) + '@typescript-eslint/utils': 8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.59.1-alpha.4 eslint: 9.39.4(jiti@2.6.1) ignore: 7.0.5 natural-compare: 1.4.0 @@ -18755,12 +18792,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)': + '@typescript-eslint/parser@8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)': dependencies: - '@typescript-eslint/scope-manager': 8.59.0 - '@typescript-eslint/types': 8.59.0 - '@typescript-eslint/typescript-estree': 8.59.0(typescript@6.0.3) - '@typescript-eslint/visitor-keys': 8.59.0 + '@typescript-eslint/scope-manager': 8.59.1-alpha.4 + '@typescript-eslint/types': 8.59.1-alpha.4 + '@typescript-eslint/typescript-estree': 8.59.1-alpha.4(typescript@6.0.3) + '@typescript-eslint/visitor-keys': 8.59.1-alpha.4 debug: 4.4.3 eslint: 9.39.4(jiti@2.6.1) typescript: 6.0.3 @@ -18785,6 +18822,15 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/project-service@8.59.1-alpha.4(typescript@6.0.3)': + dependencies: + '@typescript-eslint/tsconfig-utils': 8.59.1-alpha.4(typescript@6.0.3) + '@typescript-eslint/types': 8.59.1-alpha.4 + debug: 4.4.3 + typescript: 6.0.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/scope-manager@8.58.2': dependencies: '@typescript-eslint/types': 8.58.2 @@ -18795,6 +18841,11 @@ snapshots: '@typescript-eslint/types': 8.59.0 '@typescript-eslint/visitor-keys': 8.59.0 + '@typescript-eslint/scope-manager@8.59.1-alpha.4': + dependencies: + '@typescript-eslint/types': 8.59.1-alpha.4 + '@typescript-eslint/visitor-keys': 8.59.1-alpha.4 + '@typescript-eslint/tsconfig-utils@8.58.2(typescript@5.9.3)': dependencies: typescript: 5.9.3 @@ -18803,6 +18854,10 @@ snapshots: dependencies: typescript: 6.0.3 + '@typescript-eslint/tsconfig-utils@8.59.1-alpha.4(typescript@6.0.3)': + dependencies: + typescript: 6.0.3 + '@typescript-eslint/type-utils@8.58.2(eslint@9.39.4(jiti@1.21.7))(typescript@5.9.3)': dependencies: '@typescript-eslint/types': 8.58.2 @@ -18815,11 +18870,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/type-utils@8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)': + '@typescript-eslint/type-utils@8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)': dependencies: - '@typescript-eslint/types': 8.59.0 - '@typescript-eslint/typescript-estree': 8.59.0(typescript@6.0.3) - '@typescript-eslint/utils': 8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) + '@typescript-eslint/types': 8.59.1-alpha.4 + '@typescript-eslint/typescript-estree': 8.59.1-alpha.4(typescript@6.0.3) + '@typescript-eslint/utils': 8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) debug: 4.4.3 eslint: 9.39.4(jiti@2.6.1) ts-api-utils: 2.5.0(typescript@6.0.3) @@ -18831,6 +18886,8 @@ snapshots: '@typescript-eslint/types@8.59.0': {} + '@typescript-eslint/types@8.59.1-alpha.4': {} + '@typescript-eslint/typescript-estree@8.58.2(typescript@5.9.3)': dependencies: '@typescript-eslint/project-service': 8.58.2(typescript@5.9.3) @@ -18861,6 +18918,21 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/typescript-estree@8.59.1-alpha.4(typescript@6.0.3)': + dependencies: + '@typescript-eslint/project-service': 8.59.1-alpha.4(typescript@6.0.3) + '@typescript-eslint/tsconfig-utils': 8.59.1-alpha.4(typescript@6.0.3) + '@typescript-eslint/types': 8.59.1-alpha.4 + '@typescript-eslint/visitor-keys': 8.59.1-alpha.4 + debug: 4.4.3 + minimatch: 10.2.5 + semver: 7.7.4 + tinyglobby: 0.2.16 + ts-api-utils: 2.5.0(typescript@6.0.3) + typescript: 6.0.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/utils@8.58.2(eslint@9.39.4(jiti@1.21.7))(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4(jiti@1.21.7)) @@ -18883,6 +18955,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/utils@8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)': + dependencies: + '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4(jiti@2.6.1)) + '@typescript-eslint/scope-manager': 8.59.1-alpha.4 + '@typescript-eslint/types': 8.59.1-alpha.4 + '@typescript-eslint/typescript-estree': 8.59.1-alpha.4(typescript@6.0.3) + eslint: 9.39.4(jiti@2.6.1) + typescript: 6.0.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/visitor-keys@8.58.2': dependencies: '@typescript-eslint/types': 8.58.2 @@ -18893,6 +18976,11 @@ snapshots: '@typescript-eslint/types': 8.59.0 eslint-visitor-keys: 5.0.1 + '@typescript-eslint/visitor-keys@8.59.1-alpha.4': + dependencies: + '@typescript-eslint/types': 8.59.1-alpha.4 + eslint-visitor-keys: 5.0.1 + '@ungap/structured-clone@1.3.0': {} '@unrs/resolver-binding-android-arm-eabi@1.11.1': @@ -26031,12 +26119,12 @@ snapshots: transitivePeerDependencies: - supports-color - typescript-eslint@8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3): + typescript-eslint@8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.59.0(@typescript-eslint/parser@8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3))(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) - '@typescript-eslint/parser': 8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) - '@typescript-eslint/typescript-estree': 8.59.0(typescript@6.0.3) - '@typescript-eslint/utils': 8.59.0(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) + '@typescript-eslint/eslint-plugin': 8.59.1-alpha.4(@typescript-eslint/parser@8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3))(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) + '@typescript-eslint/parser': 8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) + '@typescript-eslint/typescript-estree': 8.59.1-alpha.4(typescript@6.0.3) + '@typescript-eslint/utils': 8.59.1-alpha.4(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3) eslint: 9.39.4(jiti@2.6.1) typescript: 6.0.3 transitivePeerDependencies: diff --git a/src/components/moderation/LabelsOnMe.tsx b/src/components/moderation/LabelsOnMe.tsx index ee8625b8a..2e9b225c0 100644 --- a/src/components/moderation/LabelsOnMe.tsx +++ b/src/components/moderation/LabelsOnMe.tsx @@ -39,7 +39,8 @@ export function LabelsOnMe({ labels = labels.filter( l => !l.val.startsWith('!') && - !(l.val === 'bot' && l.src === currentAccount.did), + !(l.val === 'bot' && l.src === currentAccount.did) && + !(l.val === 'pet' && l.src === currentAccount.did), ) if (!labels.length) { return null