Bluesky app fork with some witchin' additions 💫
Tidy up diffs to make merging easier
+101
-162
+24
-41
src/screens/PostThread/components/ThreadItemAnchor.tsx
+24
-41
src/screens/PostThread/components/ThreadItemAnchor.tsx
···
414
414
additionalCauses={additionalPostAlerts}
415
415
/>
416
416
{hasMastodonHtml ? (
417
-
<>
418
-
<MastodonHtmlContent
419
-
record={record}
420
-
style={[a.flex_1]}
421
-
textStyle={[a.text_lg]}
417
+
<MastodonHtmlContent
418
+
record={record}
419
+
style={[a.flex_1]}
420
+
textStyle={[a.text_lg]}
421
+
/>
422
+
) : richText?.text ? (
423
+
<RichText
424
+
enableTags
425
+
selectable
426
+
value={richText}
427
+
style={[a.flex_1, a.text_lg]}
428
+
authorHandle={post.author.handle}
429
+
shouldProxyLinks={true}
430
+
/>
431
+
) : undefined}
432
+
<TranslatedPost post={post} postTextStyle={[a.text_lg]} />
433
+
{post.embed && (
434
+
<View style={[a.py_xs]}>
435
+
<Embed
436
+
embed={post.embed}
437
+
moderation={moderation}
438
+
viewContext={PostEmbedViewContext.ThreadHighlighted}
439
+
onOpen={onOpenEmbed}
422
440
/>
423
-
<TranslatedPost post={post} postTextStyle={[a.text_lg]} />
424
-
{post.embed && (
425
-
<View style={[a.py_xs]}>
426
-
<Embed
427
-
embed={post.embed}
428
-
moderation={moderation}
429
-
viewContext={PostEmbedViewContext.ThreadHighlighted}
430
-
onOpen={onOpenEmbed}
431
-
/>
432
-
</View>
433
-
)}
434
-
</>
435
-
) : (
436
-
<>
437
-
{richText?.text ? (
438
-
<RichText
439
-
enableTags
440
-
selectable
441
-
value={richText}
442
-
style={[a.flex_1, a.text_lg]}
443
-
authorHandle={post.author.handle}
444
-
shouldProxyLinks={true}
445
-
/>
446
-
) : undefined}
447
-
<TranslatedPost post={post} postTextStyle={[a.text_lg]} />
448
-
{post.embed && (
449
-
<View style={[richText?.text ? a.py_xs : []]}>
450
-
<Embed
451
-
embed={post.embed}
452
-
moderation={moderation}
453
-
viewContext={PostEmbedViewContext.ThreadHighlighted}
454
-
onOpen={onOpenEmbed}
455
-
/>
456
-
</View>
457
-
)}
458
-
</>
441
+
</View>
459
442
)}
460
443
</ContentHider>
461
444
<ExpandedPostDetails
+38
-54
src/screens/PostThread/components/ThreadItemPost.tsx
+38
-54
src/screens/PostThread/components/ThreadItemPost.tsx
···
322
322
additionalCauses={additionalPostAlerts}
323
323
/>
324
324
{hasMastodonHtml ? (
325
-
<>
326
-
<MastodonHtmlContent
327
-
record={post.record}
328
-
style={[a.flex_1]}
329
-
textStyle={[a.text_md]}
325
+
<MastodonHtmlContent
326
+
record={post.record}
327
+
style={[a.flex_1]}
328
+
textStyle={[a.text_md]}
329
+
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
330
+
/>
331
+
) : richText?.text ? (
332
+
<View style={[a.mb_2xs]}>
333
+
<RichText
334
+
enableTags
335
+
value={richText}
336
+
style={[a.flex_1, a.text_md]}
330
337
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
338
+
authorHandle={post.author.handle}
339
+
shouldProxyLinks={true}
331
340
/>
332
-
<TranslatedPost hideTranslateLink post={post} />
333
-
{post.embed && (
334
-
<View style={[a.pb_xs]}>
335
-
<Embed
336
-
embed={post.embed}
337
-
moderation={moderation}
338
-
viewContext={PostEmbedViewContext.Feed}
339
-
/>
340
-
</View>
341
-
)}
342
-
</>
343
-
) : (
344
-
<>
345
-
{richText?.text ? (
346
-
<View style={[a.mb_2xs]}>
347
-
<RichText
348
-
enableTags
349
-
value={richText}
350
-
style={[a.flex_1, a.text_md]}
351
-
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
352
-
authorHandle={post.author.handle}
353
-
shouldProxyLinks={true}
354
-
/>
355
-
{limitLines && (
356
-
<ShowMoreTextButton
357
-
style={[a.text_md]}
358
-
onPress={onPressShowMore}
359
-
/>
360
-
)}
361
-
</View>
362
-
) : undefined}
363
-
<TranslatedPost hideTranslateLink post={post} />
364
-
{post.embed && (
365
-
<View
366
-
style={[
367
-
maybeApplyGalleryOffsetStyles('embed', {
368
-
post,
369
-
modui: moderation.ui('contentList'),
370
-
additionalCauses: additionalPostAlerts,
371
-
}),
372
-
a.pb_xs,
373
-
]}>
374
-
<Embed
375
-
embed={post.embed}
376
-
moderation={moderation}
377
-
viewContext={PostEmbedViewContext.Feed}
378
-
/>
379
-
</View>
341
+
{limitLines && (
342
+
<ShowMoreTextButton
343
+
style={[a.text_md]}
344
+
onPress={onPressShowMore}
345
+
/>
380
346
)}
381
-
</>
347
+
</View>
348
+
) : undefined}
349
+
<TranslatedPost hideTranslateLink post={post} />
350
+
{post.embed && (
351
+
<View
352
+
style={[
353
+
maybeApplyGalleryOffsetStyles('embed', {
354
+
post,
355
+
modui: moderation.ui('contentList'),
356
+
additionalCauses: additionalPostAlerts,
357
+
}),
358
+
a.pb_xs,
359
+
]}>
360
+
<Embed
361
+
embed={post.embed}
362
+
moderation={moderation}
363
+
viewContext={PostEmbedViewContext.Feed}
364
+
/>
365
+
</View>
382
366
)}
383
367
<PostControls
384
368
post={postShadow}
+39
-67
src/view/com/posts/PostFeedItem.tsx
+39
-67
src/view/com/posts/PostFeedItem.tsx
···
501
501
additionalCauses={additionalPostAlerts}
502
502
/>
503
503
{hasMastodonHtml ? (
504
-
<>
505
-
<MastodonHtmlContent
506
-
record={post.record as AppBskyFeedPost.Record}
507
-
style={[a.flex_1]}
508
-
textStyle={[a.text_md]}
504
+
<MastodonHtmlContent
505
+
record={post.record as AppBskyFeedPost.Record}
506
+
style={[a.flex_1]}
507
+
textStyle={[a.text_md]}
508
+
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
509
+
/>
510
+
) : richText.text ? (
511
+
<View style={[a.mb_2xs]}>
512
+
<RichText
513
+
enableTags
514
+
testID="postText"
515
+
value={richText}
509
516
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
517
+
style={[a.flex_1, a.text_md]}
518
+
authorHandle={postAuthor.handle}
519
+
shouldProxyLinks={true}
510
520
/>
511
-
{record && <TranslatedPost hideTranslateLink post={post} />}
512
-
{postEmbed ? (
513
-
<View
514
-
style={[
515
-
a.pb_xs,
516
-
maybeApplyGalleryOffsetStyles('embed', {
517
-
post,
518
-
modui: moderation.ui('contentList'),
519
-
additionalCauses: additionalPostAlerts,
520
-
}),
521
-
]}>
522
-
<Embed
523
-
embed={postEmbed}
524
-
moderation={moderation}
525
-
onOpen={onOpenEmbed}
526
-
viewContext={PostEmbedViewContext.Feed}
527
-
/>
528
-
</View>
529
-
) : null}
530
-
</>
531
-
) : (
532
-
<>
533
-
{richText.text ? (
534
-
<View style={[a.mb_2xs]}>
535
-
<RichText
536
-
enableTags
537
-
testID="postText"
538
-
value={richText}
539
-
numberOfLines={limitLines ? MAX_POST_LINES : undefined}
540
-
style={[a.flex_1, a.text_md]}
541
-
authorHandle={postAuthor.handle}
542
-
shouldProxyLinks={true}
543
-
/>
544
-
{limitLines && (
545
-
<ShowMoreTextButton
546
-
style={[a.text_md]}
547
-
onPress={onPressShowMore}
548
-
/>
549
-
)}
550
-
</View>
551
-
) : undefined}
552
-
{record && <TranslatedPost hideTranslateLink post={post} />}
553
-
{postEmbed ? (
554
-
<View
555
-
style={[
556
-
a.pb_xs,
557
-
maybeApplyGalleryOffsetStyles('embed', {
558
-
post,
559
-
modui: moderation.ui('contentList'),
560
-
additionalCauses: additionalPostAlerts,
561
-
}),
562
-
]}>
563
-
<Embed
564
-
embed={postEmbed}
565
-
moderation={moderation}
566
-
onOpen={onOpenEmbed}
567
-
viewContext={PostEmbedViewContext.Feed}
568
-
/>
569
-
</View>
570
-
) : null}
571
-
</>
572
-
)}
521
+
{limitLines && (
522
+
<ShowMoreTextButton style={[a.text_md]} onPress={onPressShowMore} />
523
+
)}
524
+
</View>
525
+
) : undefined}
526
+
{record && <TranslatedPost hideTranslateLink post={post} />}
527
+
{postEmbed ? (
528
+
<View
529
+
style={[
530
+
a.pb_xs,
531
+
maybeApplyGalleryOffsetStyles('embed', {
532
+
post,
533
+
modui: moderation.ui('contentList'),
534
+
additionalCauses: additionalPostAlerts,
535
+
}),
536
+
]}>
537
+
<Embed
538
+
embed={postEmbed}
539
+
moderation={moderation}
540
+
onOpen={onOpenEmbed}
541
+
viewContext={PostEmbedViewContext.Feed}
542
+
/>
543
+
</View>
544
+
) : null}
573
545
</ContentHider>
574
546
)
575
547
}