alice.mosphere.at / phanpy
this repo has no description
0
fork

Configure Feed

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

Fix prefs bug

- Some prefs returned can be uppercased, so make them lowercase
- `postingDefaultLanguage` probably doesn't work anymore every since masto.js upgrade. Sorry!
- Add additional checks to make sure prefs from server are not in unexpected forms

Lim Chee Aun 78ca5bbc 3be53f1f

+21 -9
+19 -7
src/components/compose.jsx
··· 289 289 focusTextarea(); 290 290 setVisibility( 291 291 visibility === 'public' && prefs['posting:default:visibility'] 292 - ? prefs['posting:default:visibility'] 292 + ? prefs['posting:default:visibility'].toLowerCase() 293 293 : visibility, 294 294 ); 295 - setLanguage(language || prefs.postingDefaultLanguage || DEFAULT_LANG); 295 + setLanguage( 296 + language || 297 + prefs['posting:default:language']?.toLowerCase() || 298 + DEFAULT_LANG, 299 + ); 296 300 setSensitive(sensitive && !!spoilerText); 297 301 } else if (editStatus) { 298 302 const { visibility, language, sensitive, poll, mediaAttachments } = ··· 316 320 focusTextarea(); 317 321 spoilerTextRef.current.value = spoilerText; 318 322 setVisibility(visibility); 319 - setLanguage(language || presf.postingDefaultLanguage || DEFAULT_LANG); 323 + setLanguage( 324 + language || 325 + prefs['posting:default:language']?.toLowerCase() || 326 + DEFAULT_LANG, 327 + ); 320 328 setSensitive(sensitive); 321 329 if (composablePoll) setPoll(composablePoll); 322 330 setMediaAttachments(mediaAttachments); ··· 331 339 focusTextarea(); 332 340 console.log('Apply prefs', prefs); 333 341 if (prefs['posting:default:visibility']) { 334 - setVisibility(prefs['posting:default:visibility']); 342 + setVisibility(prefs['posting:default:visibility'].toLowerCase()); 335 343 } 336 344 if (prefs['posting:default:language']) { 337 - setLanguage(prefs['posting:default:language']); 345 + setLanguage(prefs['posting:default:language'].toLowerCase()); 338 346 } 339 347 if (prefs['posting:default:sensitive']) { 340 - setSensitive(prefs['posting:default:sensitive']); 348 + setSensitive(!!prefs['posting:default:sensitive']); 341 349 } 342 350 } 343 351 if (draftStatus) { ··· 360 368 focusTextarea(); 361 369 if (spoilerText) spoilerTextRef.current.value = spoilerText; 362 370 if (visibility) setVisibility(visibility); 363 - setLanguage(language || prefs.postingDefaultLanguage || DEFAULT_LANG); 371 + setLanguage( 372 + language || 373 + prefs['posting:default:language']?.toLowerCase() || 374 + DEFAULT_LANG, 375 + ); 364 376 if (sensitive !== null) setSensitive(sensitive); 365 377 if (composablePoll) setPoll(composablePoll); 366 378 if (mediaAttachments) setMediaAttachments(mediaAttachments);
+1 -1
src/components/media-post.jsx
··· 108 108 const readingExpandMedia = useMemo(() => { 109 109 // default | show_all | hide_all 110 110 const prefs = store.account.get('preferences') || {}; 111 - return prefs['reading:expand:media'] || 'default'; 111 + return prefs['reading:expand:media']?.toLowerCase() || 'default'; 112 112 }, []); 113 113 const showSpoilerMedia = readingExpandMedia === 'show_all'; 114 114
+1 -1
src/components/status.jsx
··· 407 407 // default | show_all | hide_all 408 408 // Ignore hide_all because it means hide *ALL* media including non-sensitive ones 409 409 const prefs = store.account.get('preferences') || {}; 410 - return prefs['reading:expand:media'] || 'default'; 410 + return prefs['reading:expand:media']?.toLowerCase() || 'default'; 411 411 }, []); 412 412 // FOR TESTING: 413 413 // const readingExpandSpoilers = true;