patch of Render original HTML text of posts bridged from the Fediverse or Wafrn · round #0 · pull #26 · jollywhoppers.com/witchsky.app

+42 -18

src/screens/PostThread/components/ThreadItemAnchor.tsx

···

       56
       56
        
       import {PostAlerts} from '#/components/moderation/PostAlerts'

     

       57
       57
        
       import {type AppModerationCause} from '#/components/Pills'

     

       58
       58
        
       import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'

     

       59
       59
       +
       import {MastodonHtmlContent, useHasMastodonHtmlContent} from '#/components/Post/MastodonHtmlContent'

     

       59
       60
        
       import {PostControls, PostControlsSkeleton} from '#/components/PostControls'

     

       60
       61
        
       import {useFormatPostStatCount} from '#/components/PostControls/util'

     

       61
       62
        
       import {ProfileHoverCard} from '#/components/ProfileHoverCard'

     
···

       193
       194
        
         const moderation = item.moderation

     

       194
       195
        
         const authorShadow = useProfileShadow(post.author)

     

       195
       196
        
         const {isActive: live} = useActorStatus(post.author)

     

       197
       197
       +
         const hasMastodonHtml = useHasMastodonHtmlContent(record)

     

       196
       198
        
         const richText = useMemo(

     

       197
       199
        
           () =>

     

       198
       200
        
             new RichTextAPI({

     
···

       398
       400
        
                     style={[a.pb_sm]}

     

       399
       401
        
                     additionalCauses={additionalPostAlerts}

     

       400
       402
        
                   />

     

       401
       401
       -
                   {richText?.text ? (

     

       402
       402
       -
                     <RichText

     

       403
       403
       -
                       enableTags

     

       404
       404
       -
                       selectable

     

       405
       405
       -
                       value={richText}

     

       406
       406
       -
                       style={[a.flex_1, a.text_lg]}

     

       407
       407
       -
                       authorHandle={post.author.handle}

     

       408
       408
       -
                       shouldProxyLinks={true}

     

       409
       409
       -
                     />

     

       410
       410
       -
                   ) : undefined}

     

       411
       411
       -
                   {post.embed && (

     

       412
       412
       -
                     <View style={[a.py_xs]}>

     

       413
       413
       -
                       <Embed

     

       414
       414
       -
                         embed={post.embed}

     

       415
       415
       -
                         moderation={moderation}

     

       416
       416
       -
                         viewContext={PostEmbedViewContext.ThreadHighlighted}

     

       417
       417
       -
                         onOpen={onOpenEmbed}

     

       403
       403
       +
                   {hasMastodonHtml ? (

     

       404
       404
       +
                     <>

     

       405
       405
       +
                       <MastodonHtmlContent

     

       406
       406
       +
                         record={record}

     

       407
       407
       +
                         style={[a.flex_1]}

     

       408
       408
       +
                         textStyle={[a.text_lg]}

     

       418
       409
        
                       />

     

       419
       419
       -
                     </View>

     

       410
       410
       +
                       {post.embed && (

     

       411
       411
       +
                         <View style={[a.py_xs]}>

     

       412
       412
       +
                           <Embed

     

       413
       413
       +
                             embed={post.embed}

     

       414
       414
       +
                             moderation={moderation}

     

       415
       415
       +
                             viewContext={PostEmbedViewContext.ThreadHighlighted}

     

       416
       416
       +
                             onOpen={onOpenEmbed}

     

       417
       417
       +
                           />

     

       418
       418
       +
                         </View>

     

       419
       419
       +
                       )}

     

       420
       420
       +
                     </>

     

       421
       421
       +
                   ) : (

     

       422
       422
       +
                     <>

     

       423
       423
       +
                       {richText?.text ? (

     

       424
       424
       +
                         <RichText

     

       425
       425
       +
                           enableTags

     

       426
       426
       +
                           selectable

     

       427
       427
       +
                           value={richText}

     

       428
       428
       +
                           style={[a.flex_1, a.text_lg]}

     

       429
       429
       +
                           authorHandle={post.author.handle}

     

       430
       430
       +
                           shouldProxyLinks={true}

     

       431
       431
       +
                         />

     

       432
       432
       +
                       ) : undefined}

     

       433
       433
       +
                       {post.embed && (

     

       434
       434
       +
                         <View style={[a.py_xs]}>

     

       435
       435
       +
                           <Embed

     

       436
       436
       +
                             embed={post.embed}

     

       437
       437
       +
                             moderation={moderation}

     

       438
       438
       +
                             viewContext={PostEmbedViewContext.ThreadHighlighted}

     

       439
       439
       +
                             onOpen={onOpenEmbed}

     

       440
       440
       +
                           />

     

       441
       441
       +
                         </View>

     

       442
       442
       +
                       )}

     

       443
       443
       +
                     </>

     

       420
       444
        
                   )}

     

       421
       445
        
                 </ContentHider>

     

       422
       446
        
                 <ExpandedPostDetails

+46 -20

src/screens/PostThread/components/ThreadItemPost.tsx

···

       38
       38
        
       import {PostHider} from '#/components/moderation/PostHider'

     

       39
       39
        
       import {type AppModerationCause} from '#/components/Pills'

     

       40
       40
        
       import {Embed, PostEmbedViewContext} from '#/components/Post/Embed'

     

       41
       41
       +
       import {

     

       42
       42
       +
         MastodonHtmlContent,

     

       43
       43
       +
         useHasMastodonHtmlContent,

     

       44
       44
       +
       } from '#/components/Post/MastodonHtmlContent'

     

       41
       45
        
       import {ShowMoreTextButton} from '#/components/Post/ShowMoreTextButton'

     

       42
       46
        
       import {PostControls, PostControlsSkeleton} from '#/components/PostControls'

     

       43
       47
        
       import {RichText} from '#/components/RichText'

     
···

       191
       195
        
         const post = item.value.post

     

       192
       196
        
         const record = item.value.post.record

     

       193
       197
        
         const moderation = item.moderation

     

       198
       198
       +
         const hasMastodonHtml = useHasMastodonHtmlContent(post.record)

     

       194
       199
        
         const richText = useMemo(

     

       195
       200
        
           () =>

     

       196
       201
        
             new RichTextAPI({

     
···

       301
       306
        
                       style={[a.pb_2xs]}

     

       302
       307
        
                       additionalCauses={additionalPostAlerts}

     

       303
       308
        
                     />

     

       304
       304
       -
                     {richText?.text ? (

     

       309
       309
       +
                     {hasMastodonHtml ? (

     

       305
       310
        
                       <>

     

       306
       306
       -
                         <RichText

     

       307
       307
       -
                           enableTags

     

       308
       308
       -
                           value={richText}

     

       311
       311
       +
                         <MastodonHtmlContent

     

       312
       312
       +
                           record={post.record}

     

       309
       313
        
                           style={[a.flex_1, a.text_md]}

     

       310
       314
        
                           numberOfLines={limitLines ? MAX_POST_LINES : undefined}

     

       311
       311
       -
                           authorHandle={post.author.handle}

     

       312
       312
       -
                           shouldProxyLinks={true}

     

       313
       315
        
                         />

     

       314
       314
       -
                         {limitLines && (

     

       315
       315
       -
                           <ShowMoreTextButton

     

       316
       316
       -
                             style={[a.text_md]}

     

       317
       317
       -
                             onPress={onPressShowMore}

     

       318
       318
       -
                           />

     

       316
       316
       +
                         {post.embed && (

     

       317
       317
       +
                           <View style={[a.pb_xs]}>

     

       318
       318
       +
                             <Embed

     

       319
       319
       +
                               embed={post.embed}

     

       320
       320
       +
                               moderation={moderation}

     

       321
       321
       +
                               viewContext={PostEmbedViewContext.Feed}

     

       322
       322
       +
                             />

     

       323
       323
       +
                           </View>

     

       324
       324
       +
                         )}

     

       325
       325
       +
                       </>

     

       326
       326
       +
                     ) : (

     

       327
       327
       +
                       <>

     

       328
       328
       +
                         {richText?.text ? (

     

       329
       329
       +
                           <>

     

       330
       330
       +
                             <RichText

     

       331
       331
       +
                               enableTags

     

       332
       332
       +
                               value={richText}

     

       333
       333
       +
                               style={[a.flex_1, a.text_md]}

     

       334
       334
       +
                               numberOfLines={limitLines ? MAX_POST_LINES : undefined}

     

       335
       335
       +
                               authorHandle={post.author.handle}

     

       336
       336
       +
                               shouldProxyLinks={true}

     

       337
       337
       +
                             />

     

       338
       338
       +
                             {limitLines && (

     

       339
       339
       +
                               <ShowMoreTextButton

     

       340
       340
       +
                                 style={[a.text_md]}

     

       341
       341
       +
                                 onPress={onPressShowMore}

     

       342
       342
       +
                               />

     

       343
       343
       +
                             )}

     

       344
       344
       +
                           </>

     

       345
       345
       +
                         ) : undefined}

     

       346
       346
       +
                         {post.embed && (

     

       347
       347
       +
                           <View style={[a.pb_xs]}>

     

       348
       348
       +
                             <Embed

     

       349
       349
       +
                               embed={post.embed}

     

       350
       350
       +
                               moderation={moderation}

     

       351
       351
       +
                               viewContext={PostEmbedViewContext.Feed}

     

       352
       352
       +
                             />

     

       353
       353
       +
                           </View>

     

       319
       354
        
                         )}

     

       320
       355
        
                       </>

     

       321
       321
       -
                     ) : undefined}

     

       322
       322
       -
                     {post.embed && (

     

       323
       323
       -
                       <View style={[a.pb_xs]}>

     

       324
       324
       -
                         <Embed

     

       325
       325
       -
                           embed={post.embed}

     

       326
       326
       -
                           moderation={moderation}

     

       327
       327
       -
                           viewContext={PostEmbedViewContext.Feed}

     

       328
       328
       -
                         />

     

       329
       329
       -
                       </View>

     

       330
       356
        
                     )}

     

       331
       357
        
                     <PostControls

     

       332
       358
        
                       post={postShadow}

+27

src/screens/Settings/DeerSettings.tsx

···

       101
       101
        
         useNoDiscoverFallback,

     

       102
       102
        
         useSetNoDiscoverFallback,

     

       103
       103
        
       } from '#/state/preferences/no-discover-fallback'

     

       104
       104
       +
       import {

     

       105
       105
       +
         useRenderMastodonHtml,

     

       106
       106
       +
         useSetRenderMastodonHtml,

     

       107
       107
       +
       } from '#/state/preferences/render-mastodon-html'

     

       104
       108
        
       import {

     

       105
       109
        
         useRepostCarouselEnabled,

     

       106
       110
        
         useSetRepostCarouselEnabled,

     
···

       443
       447
        
         const hideSimilarAccountsRecomm = useHideSimilarAccountsRecomm()

     

       444
       448
        
         const setHideSimilarAccountsRecomm = useSetHideSimilarAccountsRecomm()

     

       445
       449
        
       

     

       450
       450
       +
         const renderMastodonHtml = useRenderMastodonHtml()

     

       451
       451
       +
         const setRenderMastodonHtml = useSetRenderMastodonHtml()

     

       452
       452
       +
       

     

       446
       453
        
         const disableVerifyEmailReminder = useDisableVerifyEmailReminder()

     

       447
       454
        
         const setDisableVerifyEmailReminder = useSetDisableVerifyEmailReminder()

     

       448
       455
        
       

     
···

       742
       749
        
                     <Toggle.Platform />

     

       743
       750
        
                   </Toggle.Item>

     

       744
       751
        
       

     

       752
       752
       +
                   <Toggle.Item

     

       753
       753
       +
       

     

       754
       754
       +
                   <Toggle.Item

     

       755
       755
       +
                     name="render_mastodon_html"

     

       756
       756
       +
                     label={_(msg`Render Mastodon HTML from bridged posts`)}

     

       757
       757
       +
                     value={renderMastodonHtml}

     

       758
       758
       +
                     onChange={value => setRenderMastodonHtml(value)}

     

       759
       759
       +
                     style={[a.w_full]}>

     

       760
       760
       +
                     <Toggle.LabelText style={[a.flex_1]}>

     

       761
       761
       +
                       <Trans>Render Mastodon HTML from bridged posts</Trans>

     

       762
       762
       +
                     </Toggle.LabelText>

     

       763
       763
       +
                     <Toggle.Platform />

     

       764
       764
       +
                   </Toggle.Item>

     

       765
       765
       +
                   <Admonition type="info" style={[a.flex_1]}>

     

       766
       766
       +
                     <Trans>

     

       767
       767
       +
                       When enabled, posts bridged from Mastodon will display their

     

       768
       768
       +
                       original HTML formatting instead of the plain text version.

     

       769
       769
       +
                     </Trans>

     

       770
       770
       +
                   </Admonition>

     

       771
       771
       +
       

     

       745
       772
        
                   <Toggle.Item

     

       746
       773
        
                     name="disable_verify_email_reminder"

     

       747
       774
        
                     label={_(msg`Disable verify email reminder`)}

src/state/persisted/schema.ts

···

       166
       166
        
           })

     

       167
       167
        
           .optional(),

     

       168
       168
        
         highQualityImages: z.boolean().optional(),

     

       169
       169
       +
         renderMastodonHtml: z.boolean().optional(),

     

       169
       170
        
       

     

       170
       171
        
         showExternalShareButtons: z.boolean().optional(),

     

       171
       172
        
       

     
···

       269
       270
        
           ],

     

       270
       271
        
         },

     

       271
       272
        
         highQualityImages: false,

     

       273
       273
       +
         renderMastodonHtml: false,

     

       272
       274
        
         showExternalShareButtons: false,

     

       273
       275
        
       }

     

       274
       276

+10 -7

src/state/preferences/index.tsx

···

       33
       33
        
       import {Provider as LargeAltBadgeProvider} from './large-alt-badge'

     

       34
       34
        
       import {Provider as NoAppLabelersProvider} from './no-app-labelers'

     

       35
       35
        
       import {Provider as NoDiscoverProvider} from './no-discover-fallback'

     

       36
       36
       +
       import {Provider as RenderMastodonHtmlProvider} from './render-mastodon-html'

     

       36
       37
        
       import {Provider as RepostCarouselProvider} from './repost-carousel-enabled'

     

       37
       38
        
       import {Provider as ShowLinkInHandleProvider} from './show-link-in-handle'

     

       38
       39
        
       import {Provider as SubtitlesProvider} from './subtitles'

     
···

       96
       97
        
                                                                         <DisableFollowedByMetricsProvider>

     

       97
       98
        
                                                                           <DisablePostsMetricsProvider>

     

       98
       99
        
                                                                             <HideSimilarAccountsRecommProvider>

     

       99
       99
       -
                                                                               <EnableSquareAvatarsProvider>

     

       100
       100
       -
                                                                                 <EnableSquareButtonsProvider>

     

       101
       101
       -
                                                                                   <DisableVerifyEmailReminderProvider>

     

       102
       102
       -
                                                                                     {children}

     

       103
       103
       -
                                                                                   </DisableVerifyEmailReminderProvider>

     

       104
       104
       -
                                                                                 </EnableSquareButtonsProvider>

     

       105
       105
       -
                                                                               </EnableSquareAvatarsProvider>

     

       100
       100
       +
                                                                               <RenderMastodonHtmlProvider>

     

       101
       101
       +
                                                                                 <EnableSquareAvatarsProvider>

     

       102
       102
       +
                                                                                   <EnableSquareButtonsProvider>

     

       103
       103
       +
                                                                                     <DisableVerifyEmailReminderProvider>

     

       104
       104
       +
                                                                                       {children}

     

       105
       105
       +
                                                                                     </DisableVerifyEmailReminderProvider>

     

       106
       106
       +
                                                                                   </EnableSquareButtonsProvider>

     

       107
       107
       +
                                                                                 </EnableSquareAvatarsProvider>

     

       108
       108
       +
                                                                               </RenderMastodonHtmlProvider>

     

       106
       109
        
                                                                             </HideSimilarAccountsRecommProvider>

     

       107
       110
        
                                                                           </DisablePostsMetricsProvider>

     

       108
       111
        
                                                                         </DisableFollowedByMetricsProvider>

+49

src/state/preferences/render-mastodon-html.tsx

···

       1
       1
       +
       import React from 'react'

     

       2
       2
       +
       

     

       3
       3
       +
       import * as persisted from '#/state/persisted'

     

       4
       4
       +
       

     

       5
       5
       +
       type StateContext = persisted.Schema['renderMastodonHtml']

     

       6
       6
       +
       type SetContext = (v: persisted.Schema['renderMastodonHtml']) => void

     

       7
       7
       +
       

     

       8
       8
       +
       const stateContext = React.createContext<StateContext>(

     

       9
       9
       +
         persisted.defaults.renderMastodonHtml,

     

       10
       10
       +
       )

     

       11
       11
       +
       const setContext = React.createContext<SetContext>(

     

       12
       12
       +
         (_: persisted.Schema['renderMastodonHtml']) => {},

     

       13
       13
       +
       )

     

       14
       14
       +
       

     

       15
       15
       +
       export function Provider({children}: React.PropsWithChildren<{}>) {

     

       16
       16
       +
         const [state, setState] = React.useState(persisted.get('renderMastodonHtml'))

     

       17
       17
       +
       

     

       18
       18
       +
         const setStateWrapped = React.useCallback(

     

       19
       19
       +
           (renderMastodonHtml: persisted.Schema['renderMastodonHtml']) => {

     

       20
       20
       +
             setState(renderMastodonHtml)

     

       21
       21
       +
             persisted.write('renderMastodonHtml', renderMastodonHtml)

     

       22
       22
       +
           },

     

       23
       23
       +
           [setState],

     

       24
       24
       +
         )

     

       25
       25
       +
       

     

       26
       26
       +
         React.useEffect(() => {

     

       27
       27
       +
           return persisted.onUpdate('renderMastodonHtml', nextValue => {

     

       28
       28
       +
             setState(nextValue)

     

       29
       29
       +
           })

     

       30
       30
       +
         }, [setStateWrapped])

     

       31
       31
       +
       

     

       32
       32
       +
         return (

     

       33
       33
       +
           <stateContext.Provider value={state}>

     

       34
       34
       +
             <setContext.Provider value={setStateWrapped}>

     

       35
       35
       +
               {children}

     

       36
       36
       +
             </setContext.Provider>

     

       37
       37
       +
           </stateContext.Provider>

     

       38
       38
       +
         )

     

       39
       39
       +
       }

     

       40
       40
       +
       

     

       41
       41
       +
       export function useRenderMastodonHtml() {

     

       42
       42
       +
         return (

     

       43
       43
       +
           React.useContext(stateContext) ?? persisted.defaults.renderMastodonHtml

     

       44
       44
       +
         )

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       47
       47
       +
       export function useSetRenderMastodonHtml() {

     

       48
       48
       +
         return React.useContext(setContext)

     

       49
       49
       +
       }

+54 -22

src/view/com/posts/PostFeedItem.tsx

···

       44
       44
        
       import {type AppModerationCause} from '#/components/Pills'

     

       45
       45
        
       import {Embed} from '#/components/Post/Embed'

     

       46
       46
        
       import {PostEmbedViewContext} from '#/components/Post/Embed/types'

     

       47
       47
       +
       import {

     

       48
       48
       +
         MastodonHtmlContent,

     

       49
       49
       +
         useHasMastodonHtmlContent,

     

       50
       50
       +
       } from '#/components/Post/MastodonHtmlContent'

     

       47
       51
        
       import {PostRepliedTo} from '#/components/Post/PostRepliedTo'

     

       48
       52
        
       import {ShowMoreTextButton} from '#/components/Post/ShowMoreTextButton'

     

       49
       53
        
       import {PostControls} from '#/components/PostControls'

     
···

       418
       422
        
         threadgateRecord?: AppBskyFeedThreadgate.Record

     

       419
       423
        
       }): React.ReactNode => {

     

       420
       424
        
         const {currentAccount} = useSession()

     

       425
       425
       +
         const hasMastodonHtml = useHasMastodonHtmlContent(

     

       426
       426
       +
           post.record as AppBskyFeedPost.Record,

     

       427
       427
       +
         )

     

       421
       428
        
         const [limitLines, setLimitLines] = useState(

     

       422
       429
        
           () => countLines(richText.text) >= MAX_POST_LINES,

     

       423
       430
        
         )

     
···

       460
       467
        
               style={[a.pb_xs]}

     

       461
       468
        
               additionalCauses={additionalPostAlerts}

     

       462
       469
        
             />

     

       463
       463
       -
             {richText.text ? (

     

       470
       470
       +
             {hasMastodonHtml ? (

     

       464
       471
        
               <>

     

       465
       465
       -
                 <RichText

     

       466
       466
       -
                   enableTags

     

       467
       467
       -
                   testID="postText"

     

       468
       468
       -
                   value={richText}

     

       469
       469
       -
                   numberOfLines={limitLines ? MAX_POST_LINES : undefined}

     

       472
       472
       +
                 <MastodonHtmlContent

     

       473
       473
       +
                   record={post.record as AppBskyFeedPost.Record}

     

       470
       474
        
                   style={[a.flex_1, a.text_md]}

     

       471
       471
       -
                   authorHandle={postAuthor.handle}

     

       472
       472
       -
                   shouldProxyLinks={true}

     

       475
       475
       +
                   numberOfLines={limitLines ? MAX_POST_LINES : undefined}

     

       473
       476
        
                 />

     

       474
       474
       -
                 {limitLines && (

     

       475
       475
       -
                   <ShowMoreTextButton style={[a.text_md]} onPress={onPressShowMore} />

     

       476
       476
       -
                 )}

     

       477
       477
       +
                 {postEmbed ? (

     

       478
       478
       +
                   <View style={[a.pb_xs]}>

     

       479
       479
       +
                     <Embed

     

       480
       480
       +
                       embed={postEmbed}

     

       481
       481
       +
                       moderation={moderation}

     

       482
       482
       +
                       onOpen={onOpenEmbed}

     

       483
       483
       +
                       viewContext={PostEmbedViewContext.Feed}

     

       484
       484
       +
                     />

     

       485
       485
       +
                   </View>

     

       486
       486
       +
                 ) : null}

     

       477
       487
        
               </>

     

       478
       478
       -
             ) : undefined}

     

       479
       479
       -
             {postEmbed ? (

     

       480
       480
       -
               <View style={[a.pb_xs]}>

     

       481
       481
       -
                 <Embed

     

       482
       482
       -
                   embed={postEmbed}

     

       483
       483
       -
                   moderation={moderation}

     

       484
       484
       -
                   onOpen={onOpenEmbed}

     

       485
       485
       -
                   viewContext={PostEmbedViewContext.Feed}

     

       486
       486
       -
                 />

     

       487
       487
       -
               </View>

     

       488
       488
       -
             ) : null}

     

       488
       488
       +
             ) : (

     

       489
       489
       +
               <>

     

       490
       490
       +
                 {richText.text ? (

     

       491
       491
       +
                   <>

     

       492
       492
       +
                     <RichText

     

       493
       493
       +
                       enableTags

     

       494
       494
       +
                       testID="postText"

     

       495
       495
       +
                       value={richText}

     

       496
       496
       +
                       numberOfLines={limitLines ? MAX_POST_LINES : undefined}

     

       497
       497
       +
                       style={[a.flex_1, a.text_md]}

     

       498
       498
       +
                       authorHandle={postAuthor.handle}

     

       499
       499
       +
                       shouldProxyLinks={true}

     

       500
       500
       +
                     />

     

       501
       501
       +
                     {limitLines && (

     

       502
       502
       +
                       <ShowMoreTextButton

     

       503
       503
       +
                         style={[a.text_md]}

     

       504
       504
       +
                         onPress={onPressShowMore}

     

       505
       505
       +
                       />

     

       506
       506
       +
                     )}

     

       507
       507
       +
                   </>

     

       508
       508
       +
                 ) : undefined}

     

       509
       509
       +
                 {postEmbed ? (

     

       510
       510
       +
                   <View style={[a.pb_xs]}>

     

       511
       511
       +
                     <Embed

     

       512
       512
       +
                       embed={postEmbed}

     

       513
       513
       +
                       moderation={moderation}

     

       514
       514
       +
                       onOpen={onOpenEmbed}

     

       515
       515
       +
                       viewContext={PostEmbedViewContext.Feed}

     

       516
       516
       +
                     />

     

       517
       517
       +
                   </View>

     

       518
       518
       +
                 ) : null}

     

       519
       519
       +
               </>

     

       520
       520
       +
             )}

     

       489
       521
        
           </ContentHider>

     

       490
       522
        
         )

     

       491
       523
        
       }