this repo has no description
0
fork

Configure Feed

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

Fix conflict between "always show media" vs blur filter

blur filter > show_all

+53 -52
+3 -2
src/components/status.jsx
··· 554 554 previewMode || readingExpandSpoilers || !!snapStates.spoilers[id]; 555 555 const showSpoilerMedia = 556 556 previewMode || 557 - readingExpandMedia === 'show_all' || 557 + (readingExpandMedia === 'show_all' && filterInfo?.action !== 'blur') || 558 558 !!snapStates.spoilersMedia[id]; 559 559 560 560 if (reblog) { ··· 2211 2211 {!previewMode && 2212 2212 (sensitive || filterInfo?.action === 'blur') && 2213 2213 !!mediaAttachments.length && 2214 - readingExpandMedia !== 'show_all' && ( 2214 + (readingExpandMedia === 'show_all' || 2215 + filterInfo?.action === 'blur') && ( 2215 2216 <button 2216 2217 class={`plain spoiler-media-button ${ 2217 2218 showSpoilerMedia ? 'spoiling' : ''
+50 -50
src/locales/en.po
··· 114 114 #: src/components/status.jsx:1794 115 115 #: src/components/status.jsx:1811 116 116 #: src/components/status.jsx:1936 117 - #: src/components/status.jsx:2553 118 - #: src/components/status.jsx:2556 117 + #: src/components/status.jsx:2554 118 + #: src/components/status.jsx:2557 119 119 #: src/pages/account-statuses.jsx:523 120 120 #: src/pages/accounts.jsx:110 121 121 #: src/pages/hashtag.jsx:200 ··· 203 203 msgstr "" 204 204 205 205 #: src/components/account-info.jsx:926 206 - #: src/components/status.jsx:2337 206 + #: src/components/status.jsx:2338 207 207 #: src/pages/catchup.jsx:72 208 208 #: src/pages/catchup.jsx:1442 209 209 #: src/pages/catchup.jsx:2057 ··· 312 312 #: src/components/account-info.jsx:1393 313 313 #: src/components/shortcuts-settings.jsx:1059 314 314 #: src/components/status.jsx:1243 315 - #: src/components/status.jsx:3324 315 + #: src/components/status.jsx:3325 316 316 msgid "Copy" 317 317 msgstr "" 318 318 ··· 437 437 #: src/components/shortcuts-settings.jsx:230 438 438 #: src/components/shortcuts-settings.jsx:583 439 439 #: src/components/shortcuts-settings.jsx:783 440 - #: src/components/status.jsx:3048 441 - #: src/components/status.jsx:3288 442 - #: src/components/status.jsx:3789 440 + #: src/components/status.jsx:3049 441 + #: src/components/status.jsx:3289 442 + #: src/components/status.jsx:3790 443 443 #: src/pages/accounts.jsx:37 444 444 #: src/pages/catchup.jsx:1578 445 445 #: src/pages/filters.jsx:225 ··· 756 756 #: src/components/status.jsx:1008 757 757 #: src/components/status.jsx:1774 758 758 #: src/components/status.jsx:1775 759 - #: src/components/status.jsx:2457 759 + #: src/components/status.jsx:2458 760 760 msgid "Reply" 761 761 msgstr "" 762 762 ··· 1188 1188 1189 1189 #: src/components/keyboard-shortcuts-help.jsx:175 1190 1190 #: src/components/status.jsx:1016 1191 - #: src/components/status.jsx:2484 1192 - #: src/components/status.jsx:2507 1191 + #: src/components/status.jsx:2485 1193 1192 #: src/components/status.jsx:2508 1193 + #: src/components/status.jsx:2509 1194 1194 msgid "Boost" 1195 1195 msgstr "" 1196 1196 ··· 1200 1200 1201 1201 #: src/components/keyboard-shortcuts-help.jsx:183 1202 1202 #: src/components/status.jsx:1079 1203 - #: src/components/status.jsx:2532 1204 1203 #: src/components/status.jsx:2533 1204 + #: src/components/status.jsx:2534 1205 1205 msgid "Bookmark" 1206 1206 msgstr "" 1207 1207 ··· 1305 1305 msgstr "" 1306 1306 1307 1307 #: src/components/media-post.jsx:134 1308 - #: src/components/status.jsx:3619 1309 - #: src/components/status.jsx:3715 1310 - #: src/components/status.jsx:3793 1308 + #: src/components/status.jsx:3620 1309 + #: src/components/status.jsx:3716 1310 + #: src/components/status.jsx:3794 1311 1311 #: src/components/timeline.jsx:982 1312 1312 #: src/pages/catchup.jsx:76 1313 1313 #: src/pages/catchup.jsx:1876 ··· 2186 2186 2187 2187 #: src/components/status.jsx:1016 2188 2188 #: src/components/status.jsx:1056 2189 - #: src/components/status.jsx:2484 2190 - #: src/components/status.jsx:2507 2189 + #: src/components/status.jsx:2485 2190 + #: src/components/status.jsx:2508 2191 2191 msgid "Unboost" 2192 2192 msgstr "" 2193 2193 2194 2194 #: src/components/status.jsx:1032 2195 - #: src/components/status.jsx:2499 2195 + #: src/components/status.jsx:2500 2196 2196 msgid "Quote" 2197 2197 msgstr "" 2198 2198 ··· 2214 2214 2215 2215 #: src/components/status.jsx:1069 2216 2216 #: src/components/status.jsx:1784 2217 - #: src/components/status.jsx:2520 2217 + #: src/components/status.jsx:2521 2218 2218 msgid "Unlike" 2219 2219 msgstr "" 2220 2220 2221 2221 #: src/components/status.jsx:1070 2222 2222 #: src/components/status.jsx:1784 2223 2223 #: src/components/status.jsx:1785 2224 - #: src/components/status.jsx:2520 2225 2224 #: src/components/status.jsx:2521 2225 + #: src/components/status.jsx:2522 2226 2226 msgid "Like" 2227 2227 msgstr "" 2228 2228 2229 2229 #: src/components/status.jsx:1079 2230 - #: src/components/status.jsx:2532 2230 + #: src/components/status.jsx:2533 2231 2231 msgid "Unbookmark" 2232 2232 msgstr "" 2233 2233 ··· 2245 2245 msgstr "" 2246 2246 2247 2247 #: src/components/status.jsx:1278 2248 - #: src/components/status.jsx:3293 2248 + #: src/components/status.jsx:3294 2249 2249 msgid "Embed post" 2250 2250 msgstr "" 2251 2251 ··· 2315 2315 2316 2316 #: src/components/status.jsx:1785 2317 2317 #: src/components/status.jsx:1821 2318 - #: src/components/status.jsx:2521 2318 + #: src/components/status.jsx:2522 2319 2319 msgid "Liked" 2320 2320 msgstr "" 2321 2321 2322 2322 #: src/components/status.jsx:1818 2323 - #: src/components/status.jsx:2508 2323 + #: src/components/status.jsx:2509 2324 2324 msgid "Boosted" 2325 2325 msgstr "" 2326 2326 2327 2327 #: src/components/status.jsx:1828 2328 - #: src/components/status.jsx:2533 2328 + #: src/components/status.jsx:2534 2329 2329 msgid "Bookmarked" 2330 2330 msgstr "" 2331 2331 ··· 2334 2334 msgstr "" 2335 2335 2336 2336 #: src/components/status.jsx:1878 2337 - #: src/components/status.jsx:2345 2337 + #: src/components/status.jsx:2346 2338 2338 msgid "Deleted" 2339 2339 msgstr "" 2340 2340 ··· 2349 2349 2350 2350 #: src/components/status.jsx:2087 2351 2351 #: src/components/status.jsx:2149 2352 - #: src/components/status.jsx:2241 2352 + #: src/components/status.jsx:2242 2353 2353 msgid "Show less" 2354 2354 msgstr "" 2355 2355 ··· 2360 2360 2361 2361 #. placeholder {0}: filterInfo.titlesStr 2362 2362 #. placeholder {0}: filterInfo?.titlesStr 2363 - #: src/components/status.jsx:2237 2363 + #: src/components/status.jsx:2238 2364 2364 #: src/pages/catchup.jsx:1875 2365 2365 msgid "Filtered: {0}" 2366 2366 msgstr "Filtered: {0}" 2367 2367 2368 - #: src/components/status.jsx:2241 2368 + #: src/components/status.jsx:2242 2369 2369 msgid "Show media" 2370 2370 msgstr "" 2371 2371 2372 - #: src/components/status.jsx:2381 2372 + #: src/components/status.jsx:2382 2373 2373 msgid "Edited" 2374 2374 msgstr "" 2375 2375 2376 - #: src/components/status.jsx:2458 2376 + #: src/components/status.jsx:2459 2377 2377 msgid "Comments" 2378 2378 msgstr "" 2379 2379 2380 2380 #. More from [Author] 2381 - #: src/components/status.jsx:2751 2381 + #: src/components/status.jsx:2752 2382 2382 msgid "More from <0/>" 2383 2383 msgstr "More from <0/>" 2384 2384 2385 - #: src/components/status.jsx:3053 2385 + #: src/components/status.jsx:3054 2386 2386 msgid "Edit History" 2387 2387 msgstr "" 2388 2388 2389 - #: src/components/status.jsx:3057 2389 + #: src/components/status.jsx:3058 2390 2390 msgid "Failed to load history" 2391 2391 msgstr "" 2392 2392 2393 - #: src/components/status.jsx:3062 2393 + #: src/components/status.jsx:3063 2394 2394 #: src/pages/annual-report.jsx:45 2395 2395 msgid "Loading…" 2396 2396 msgstr "" 2397 2397 2398 - #: src/components/status.jsx:3298 2398 + #: src/components/status.jsx:3299 2399 2399 msgid "HTML Code" 2400 2400 msgstr "" 2401 2401 2402 - #: src/components/status.jsx:3315 2402 + #: src/components/status.jsx:3316 2403 2403 msgid "HTML code copied" 2404 2404 msgstr "" 2405 2405 2406 - #: src/components/status.jsx:3318 2406 + #: src/components/status.jsx:3319 2407 2407 msgid "Unable to copy HTML code" 2408 2408 msgstr "" 2409 2409 2410 - #: src/components/status.jsx:3330 2410 + #: src/components/status.jsx:3331 2411 2411 msgid "Media attachments:" 2412 2412 msgstr "" 2413 2413 2414 - #: src/components/status.jsx:3352 2414 + #: src/components/status.jsx:3353 2415 2415 msgid "Account Emojis:" 2416 2416 msgstr "" 2417 2417 2418 - #: src/components/status.jsx:3383 2419 - #: src/components/status.jsx:3428 2418 + #: src/components/status.jsx:3384 2419 + #: src/components/status.jsx:3429 2420 2420 msgid "static URL" 2421 2421 msgstr "" 2422 2422 2423 - #: src/components/status.jsx:3397 2423 + #: src/components/status.jsx:3398 2424 2424 msgid "Emojis:" 2425 2425 msgstr "" 2426 2426 2427 - #: src/components/status.jsx:3442 2427 + #: src/components/status.jsx:3443 2428 2428 msgid "Notes:" 2429 2429 msgstr "" 2430 2430 2431 - #: src/components/status.jsx:3446 2431 + #: src/components/status.jsx:3447 2432 2432 msgid "This is static, unstyled and scriptless. You may need to apply your own styles and edit as needed." 2433 2433 msgstr "" 2434 2434 2435 - #: src/components/status.jsx:3452 2435 + #: src/components/status.jsx:3453 2436 2436 msgid "Polls are not interactive, becomes a list with vote counts." 2437 2437 msgstr "" 2438 2438 2439 - #: src/components/status.jsx:3457 2439 + #: src/components/status.jsx:3458 2440 2440 msgid "Media attachments can be images, videos, audios or any file types." 2441 2441 msgstr "" 2442 2442 2443 - #: src/components/status.jsx:3463 2443 + #: src/components/status.jsx:3464 2444 2444 msgid "Post could be edited or deleted later." 2445 2445 msgstr "" 2446 2446 2447 - #: src/components/status.jsx:3469 2447 + #: src/components/status.jsx:3470 2448 2448 msgid "Preview" 2449 2449 msgstr "" 2450 2450 2451 - #: src/components/status.jsx:3478 2451 + #: src/components/status.jsx:3479 2452 2452 msgid "Note: This preview is lightly styled." 2453 2453 msgstr "" 2454 2454 2455 2455 #. [Name] [Visibility icon] boosted 2456 - #: src/components/status.jsx:3723 2456 + #: src/components/status.jsx:3724 2457 2457 msgid "<0/> <1/> boosted" 2458 2458 msgstr "" 2459 2459