ellioth.co / witchsky.app
forked from jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

notif settings lexicon change (#8518)

authored by

Samuel Newman and committed by
GitHub 3304cd04 32ba17a4

+59 -59
+2 -2
package.json
··· 69 69 "icons:optimize": "svgo -f ./assets/icons" 70 70 }, 71 71 "dependencies": { 72 - "@atproto/api": "^0.15.15", 72 + "@atproto/api": "^0.15.16", 73 73 "@bitdrift/react-native": "^0.6.8", 74 74 "@braintree/sanitize-url": "^6.0.2", 75 75 "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet", ··· 218 218 "zod": "^3.20.2" 219 219 }, 220 220 "devDependencies": { 221 - "@atproto/dev-env": "^0.3.142", 221 + "@atproto/dev-env": "^0.3.144", 222 222 "@babel/core": "^7.26.0", 223 223 "@babel/preset-env": "^7.26.0", 224 224 "@babel/runtime": "^7.26.0",
+3 -3
src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx
··· 85 85 86 86 const newPreference = { 87 87 ...preference, 88 - filter: change, 88 + include: change, 89 89 } satisfies typeof preference 90 90 91 91 mutate({ ··· 138 138 )} 139 139 </View> 140 140 </Toggle.Group> 141 - {'filter' in preference && ( 141 + {'include' in preference && ( 142 142 <> 143 143 <Divider /> 144 144 <Text style={[a.font_bold, a.text_md]}> ··· 147 147 <Toggle.Group 148 148 type="radio" 149 149 label={_(msg`Filter who you receive notifications from`)} 150 - values={[preference.filter]} 150 + values={[preference.include]} 151 151 onChange={onChangeFilter} 152 152 disabled={channels.length === 0}> 153 153 <View style={[a.gap_sm]}>
+3 -3
src/screens/Settings/NotificationSettings/index.tsx
··· 260 260 if (!preference) { 261 261 return null 262 262 } else { 263 - if ('filter' in preference) { 264 - if (preference.filter === 'all') { 263 + if ('include' in preference) { 264 + if (preference.include === 'all') { 265 265 if (preference.list && preference.push) { 266 266 return _(msg`In-app, Push, Everyone`) 267 267 } else if (preference.list) { ··· 269 269 } else if (preference.push) { 270 270 return _(msg`Push, Everyone`) 271 271 } 272 - } else if (preference.filter === 'follows') { 272 + } else if (preference.include === 'follows') { 273 273 if (preference.list && preference.push) { 274 274 return _(msg`In-app, Push, People you follow`) 275 275 } else if (preference.list) {
+51 -51
yarn.lock
··· 63 63 "@atproto/xrpc" "^0.7.0" 64 64 "@atproto/xrpc-server" "^0.8.0" 65 65 66 - "@atproto/api@^0.15.15": 67 - version "0.15.15" 68 - resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.15.15.tgz#a506a1a26f3dfef9adb77234f451c0e784b071e7" 69 - integrity sha512-Wn8jv76pCvffnkNj68w0CGZ3PT4DJGM8DUZnYq9kEW2im6jbRBYI0yYrHNhSiE92A5Ox0HjL2jMhalsI2p9VlQ== 66 + "@atproto/api@^0.15.16": 67 + version "0.15.16" 68 + resolved "https://registry.yarnpkg.com/@atproto/api/-/api-0.15.16.tgz#1962e7067e03a661e17c3164874596ef1e7ed7ad" 69 + integrity sha512-ZNBrzBg2l0lHreKik1lJn8lrhAktwlY8NUPBU/hO9dwjAnDHQTiSzNFZt65dp9djmqZ75sX/VJ+heNuaJBvnhQ== 70 70 dependencies: 71 71 "@atproto/common-web" "^0.4.2" 72 72 "@atproto/lexicon" "^0.4.11" ··· 77 77 tlds "^1.234.0" 78 78 zod "^3.23.8" 79 79 80 - "@atproto/aws@^0.2.21": 81 - version "0.2.21" 82 - resolved "https://registry.yarnpkg.com/@atproto/aws/-/aws-0.2.21.tgz#06006a101c8004db11384a19366296cd87468326" 83 - integrity sha512-bosExZ3YdFjOehNBcNWsC2mZBrAVLO8Ut/JquypXSahFeeXZP/9rd9F1VGf+vAmjFEKagHXQCb6CRFfJyN+I7A== 80 + "@atproto/aws@^0.2.22": 81 + version "0.2.22" 82 + resolved "https://registry.yarnpkg.com/@atproto/aws/-/aws-0.2.22.tgz#14a664c06e3569945e4ab143d3a8a03400c7d1de" 83 + integrity sha512-xZ+0/zHHmpgzdLJGTDkFl5Wd39Wm5MyyMLdGYSzyt0wGTBmH6Ktp7ZgR8rmQVNYN1+VkMcdClAiNhg+BSH3mRw== 84 84 dependencies: 85 85 "@atproto/common" "^0.4.11" 86 86 "@atproto/crypto" "^0.4.4" 87 - "@atproto/repo" "^0.8.1" 87 + "@atproto/repo" "^0.8.2" 88 88 "@aws-sdk/client-cloudfront" "^3.261.0" 89 89 "@aws-sdk/client-kms" "^3.196.0" 90 90 "@aws-sdk/client-s3" "^3.224.0" ··· 94 94 multiformats "^9.9.0" 95 95 uint8arrays "3.0.0" 96 96 97 - "@atproto/bsky@^0.0.159": 98 - version "0.0.159" 99 - resolved "https://registry.yarnpkg.com/@atproto/bsky/-/bsky-0.0.159.tgz#6fcfd7d6c73e4041c5abc9ac3b99dbe0e1e6cf76" 100 - integrity sha512-kRjDCW6FbByeafrEoUD5YMhhjuKTvSqrE2/QJ5xe9CP8UIhl8BShm2PcBh9gJtYc7lO83aJPqDSqb5gJwNAJUg== 97 + "@atproto/bsky@^0.0.161": 98 + version "0.0.161" 99 + resolved "https://registry.yarnpkg.com/@atproto/bsky/-/bsky-0.0.161.tgz#671280c1d40f5c4eb0cc31d338a9e950acbf0ce0" 100 + integrity sha512-L4uzadjt+oyVq3+W7rc1A+X2DyZDsTfeSD15w7k6+6JzICp32qavDuVjut3CIBqXCt7ykvSDujApyLsB/lcWJQ== 101 101 dependencies: 102 102 "@atproto-labs/fetch-node" "0.1.9" 103 103 "@atproto-labs/xrpc-utils" "0.0.16" 104 - "@atproto/api" "^0.15.15" 104 + "@atproto/api" "^0.15.16" 105 105 "@atproto/common" "^0.4.11" 106 106 "@atproto/crypto" "^0.4.4" 107 107 "@atproto/did" "^0.1.5" 108 108 "@atproto/identity" "^0.4.8" 109 109 "@atproto/lexicon" "^0.4.11" 110 - "@atproto/repo" "^0.8.1" 111 - "@atproto/sync" "^0.1.25" 110 + "@atproto/repo" "^0.8.2" 111 + "@atproto/sync" "^0.1.26" 112 112 "@atproto/syntax" "^0.4.0" 113 113 "@atproto/xrpc-server" "^0.8.0" 114 114 "@bufbuild/protobuf" "^1.5.0" ··· 218 218 "@noble/hashes" "^1.6.1" 219 219 uint8arrays "3.0.0" 220 220 221 - "@atproto/dev-env@^0.3.142": 222 - version "0.3.142" 223 - resolved "https://registry.yarnpkg.com/@atproto/dev-env/-/dev-env-0.3.142.tgz#466cff00c92d53ad148709ae50bcca816fcee1bc" 224 - integrity sha512-NiNb3Pdj93goEmKBIF5rIlLSmkfZiwnYmo7U6cGvGXoopRNG5e4Vm2PXb1n7uVdzuvEtiPtpswQxaf0x6jJsWA== 221 + "@atproto/dev-env@^0.3.144": 222 + version "0.3.144" 223 + resolved "https://registry.yarnpkg.com/@atproto/dev-env/-/dev-env-0.3.144.tgz#cd2949ff870ca4cde23b4c377b08740a2e64151f" 224 + integrity sha512-ND0oGp7itSnXxlAHlFxYjGFyCcu0f4eSucImVtKRxTcW8UeyyTtJcQP8OyNvtC8j13YjbW124r0g25Wlm0j9XQ== 225 225 dependencies: 226 - "@atproto/api" "^0.15.15" 227 - "@atproto/bsky" "^0.0.159" 226 + "@atproto/api" "^0.15.16" 227 + "@atproto/bsky" "^0.0.161" 228 228 "@atproto/bsync" "^0.0.20" 229 229 "@atproto/common-web" "^0.4.2" 230 230 "@atproto/crypto" "^0.4.4" 231 231 "@atproto/identity" "^0.4.8" 232 232 "@atproto/lexicon" "^0.4.11" 233 - "@atproto/ozone" "^0.1.120" 234 - "@atproto/pds" "^0.4.148" 235 - "@atproto/sync" "^0.1.25" 233 + "@atproto/ozone" "^0.1.121" 234 + "@atproto/pds" "^0.4.150" 235 + "@atproto/sync" "^0.1.26" 236 236 "@atproto/syntax" "^0.4.0" 237 237 "@atproto/xrpc-server" "^0.8.0" 238 238 "@did-plc/lib" "^0.0.1" ··· 308 308 optionalDependencies: 309 309 "@atproto/oauth-provider-api" "0.1.4" 310 310 311 - "@atproto/oauth-provider@^0.9.0": 312 - version "0.9.0" 313 - resolved "https://registry.yarnpkg.com/@atproto/oauth-provider/-/oauth-provider-0.9.0.tgz#3598924978c2e3d5fdf62bced54574156d15cf92" 314 - integrity sha512-LbZS9rbR5l9gVO97wJ3ls+ENXwv6BakmArRyjc5EfaQ4Xc3eLbvE629hpu9LV8LyCkBpseum0l+D+rYXsemNUw== 311 + "@atproto/oauth-provider@^0.9.1": 312 + version "0.9.1" 313 + resolved "https://registry.yarnpkg.com/@atproto/oauth-provider/-/oauth-provider-0.9.1.tgz#0147b75d1ad444455159f0a687ce87b3b49a2894" 314 + integrity sha512-2Gm3jv45cGLmUQV0C4/orCJBsHu4wajy+JTN9f/ATX3vvjnFtAd/1GRvAMKDGXtdF7VIjNFlD+4lqhoDxYJpng== 315 315 dependencies: 316 316 "@atproto-labs/fetch" "0.2.3" 317 317 "@atproto-labs/fetch-node" "0.1.9" ··· 347 347 "@atproto/jwk" "0.3.0" 348 348 zod "^3.23.8" 349 349 350 - "@atproto/ozone@^0.1.120": 351 - version "0.1.120" 352 - resolved "https://registry.yarnpkg.com/@atproto/ozone/-/ozone-0.1.120.tgz#b5c431a538558179de0465cfbfea512d65e092bf" 353 - integrity sha512-zu2f16K/z/3r4mC4z/8qISPt0j+Y0GwtjmSE+VOJvVT363iOd9a834K+QHJqnD6B3iTBHR1VPlZ/4fsZ3+4UaA== 350 + "@atproto/ozone@^0.1.121": 351 + version "0.1.121" 352 + resolved "https://registry.yarnpkg.com/@atproto/ozone/-/ozone-0.1.121.tgz#309b7e876f3b598ed4e79bb5a79e2346931588fe" 353 + integrity sha512-kc3NxiXSPqQmWz8yXlV5cFnZ469ViQd0AexEMw467AcB8ikK1WSxhLsa1EiNAQuLOOpyeXSmAKGAUFHzSOIMpw== 354 354 dependencies: 355 - "@atproto/api" "^0.15.15" 355 + "@atproto/api" "^0.15.16" 356 356 "@atproto/common" "^0.4.11" 357 357 "@atproto/crypto" "^0.4.4" 358 358 "@atproto/identity" "^0.4.8" ··· 377 377 undici "^6.14.1" 378 378 ws "^8.12.0" 379 379 380 - "@atproto/pds@^0.4.148": 381 - version "0.4.148" 382 - resolved "https://registry.yarnpkg.com/@atproto/pds/-/pds-0.4.148.tgz#7af82480e42174ea1c284f5975bf0aff3bd4da24" 383 - integrity sha512-PbxTpxRAcsdu3zANjwNH+Pfbu0pfj5z6UDmcnc3eaEP11xsExu3+B84jOYKAkIN/PbM1A9EbiBjKb95yBQxGAw== 380 + "@atproto/pds@^0.4.150": 381 + version "0.4.150" 382 + resolved "https://registry.yarnpkg.com/@atproto/pds/-/pds-0.4.150.tgz#45686b05b8ed46e265efa5231ab16e6eda72a8e8" 383 + integrity sha512-CPT6H2uDTe4ZAyxQbws2dIlmdFFf6GQGwMc0OE3kI1wBBaLHprpexjM2Gd4ObtYNxGOOV0fwoCDAth8qqZ4XVw== 384 384 dependencies: 385 385 "@atproto-labs/fetch-node" "0.1.9" 386 386 "@atproto-labs/xrpc-utils" "0.0.16" 387 - "@atproto/api" "^0.15.15" 388 - "@atproto/aws" "^0.2.21" 387 + "@atproto/api" "^0.15.16" 388 + "@atproto/aws" "^0.2.22" 389 389 "@atproto/common" "^0.4.11" 390 390 "@atproto/crypto" "^0.4.4" 391 391 "@atproto/identity" "^0.4.8" 392 392 "@atproto/lexicon" "^0.4.11" 393 - "@atproto/oauth-provider" "^0.9.0" 394 - "@atproto/repo" "^0.8.1" 393 + "@atproto/oauth-provider" "^0.9.1" 394 + "@atproto/repo" "^0.8.2" 395 395 "@atproto/syntax" "^0.4.0" 396 396 "@atproto/xrpc" "^0.7.0" 397 397 "@atproto/xrpc-server" "^0.8.0" ··· 424 424 undici "^6.19.8" 425 425 zod "^3.23.8" 426 426 427 - "@atproto/repo@^0.8.1": 428 - version "0.8.1" 429 - resolved "https://registry.yarnpkg.com/@atproto/repo/-/repo-0.8.1.tgz#be8c6b93c000944b81aaa1026d6c50d82c025d74" 430 - integrity sha512-d1NtHhXYJVJlFVI6mbVOUnpB0rnhqxPnZcALkJoYJjaDPVr4NNqRFAtrwb+GHzxT6DhijoXYQf24pKGfEFDd4g== 427 + "@atproto/repo@^0.8.2": 428 + version "0.8.2" 429 + resolved "https://registry.yarnpkg.com/@atproto/repo/-/repo-0.8.2.tgz#7953cb2c637c94505da76f74a784b2aae050c204" 430 + integrity sha512-lP0g5Uw3TUC2Tc7te8YKCpRoIhBYI+Uvn11fupGEaMcMjgLdYtB0Kc0AiqWXF42KqlBG9dAEoJITi2GRzDNHUg== 431 431 dependencies: 432 432 "@atproto/common" "^0.4.11" 433 433 "@atproto/common-web" "^0.4.2" ··· 439 439 varint "^6.0.0" 440 440 zod "^3.23.8" 441 441 442 - "@atproto/sync@^0.1.25": 443 - version "0.1.25" 444 - resolved "https://registry.yarnpkg.com/@atproto/sync/-/sync-0.1.25.tgz#66b3453e3cf0ba6a155dbbf207ea46d632c2d6b0" 445 - integrity sha512-4UsQgQsUK+hKFAEDi10Ops6n2W/kfk2JYP8AU6FSHAzOadB1hKRDJbGF5vLiLP9ACBhCzoJerZ31DCnhjzRzfw== 442 + "@atproto/sync@^0.1.26": 443 + version "0.1.26" 444 + resolved "https://registry.yarnpkg.com/@atproto/sync/-/sync-0.1.26.tgz#6be2876be612d9cd704452598ee679b2e912cfe3" 445 + integrity sha512-bpUIajtPrE3RgFW8mIfrI4EM/LJ4JjQhI5fsqc78zCHZawuflpllf1aH70roDWWiskMWoiLWnVRxdYXdeEgbXA== 446 446 dependencies: 447 447 "@atproto/common" "^0.4.11" 448 448 "@atproto/identity" "^0.4.8" 449 449 "@atproto/lexicon" "^0.4.11" 450 - "@atproto/repo" "^0.8.1" 450 + "@atproto/repo" "^0.8.2" 451 451 "@atproto/syntax" "^0.4.0" 452 452 "@atproto/xrpc-server" "^0.8.0" 453 453 multiformats "^9.9.0"