Bluesky app fork with some witchin' additions 💫

fix: pds badge dialogs & default visibility

xan.lol 6b8364e6 045a68b5

verified
+42 -35
+41 -34
src/components/PdsDialog.tsx
··· 4 4 FontAwesomeIcon, 5 5 type FontAwesomeIconStyle, 6 6 } from '@fortawesome/react-native-fontawesome' 7 - import {msg, Trans} from '@lingui/macro' 7 + import {msg} from '@lingui/core/macro' 8 8 import {useLingui} from '@lingui/react' 9 + import {Trans} from '@lingui/react/macro' 9 10 10 11 import {isBridgedPdsUrl, isBskyPdsUrl} from '#/state/queries/pds-label' 11 12 12 13 const failedFaviconUrls = new Set<string>() 14 + import Svg, {G, Path, Rect} from 'react-native-svg' 15 + 13 16 import {atoms as a, useBreakpoints, useTheme} from '#/alf' 14 17 import {Button, ButtonText} from '#/components/Button' 15 18 import * as Dialog from '#/components/Dialog' 16 - import Svg, {G, Path, Rect} from 'react-native-svg' 17 19 import {InlineLinkText} from '#/components/Link' 18 20 import {Text} from '#/components/Typography' 19 21 ··· 75 77 size={36} 76 78 /> 77 79 <View style={[a.flex_1]}> 78 - {/*<Text 79 - style={[a.text_2xl, a.font_semi_bold, a.leading_tight]} 80 - numberOfLines={1}> 81 - {displayName} 82 - </Text>*/} 83 - <Text style={[a.text_2xl, a.font_semi_bold, a.leading_tight]}> 84 - {isBsky && <Trans>Bluesky-hosted PDS</Trans>} 85 - {isBridged && <Trans>Fediverse bridge</Trans>} 86 - {!isBsky && !isBridged && <Trans>Third-party PDS</Trans>} 80 + { 81 + <Text 82 + style={[a.text_2xl, a.font_semi_bold, a.leading_tight]} 83 + numberOfLines={1}> 84 + {isBridged ? <Trans>Fediverse</Trans> : displayName} 85 + </Text> 86 + } 87 + <Text style={[a.text_sm, a.leading_tight]}> 88 + {isBsky && <Trans>Bluesky Social</Trans>} 87 89 </Text> 88 90 </View> 89 91 </View> 90 92 91 93 <Text style={[a.text_md, a.leading_snug]}> 92 94 <Trans> 93 - This badge represents the{' '} 94 - <InlineLinkText 95 - to={'https://atproto.com/guides/self-hosting'} 96 - label={displayName} 97 - style={[a.text_md, a.font_semi_bold]}> 98 - Personal Data Server 99 - </InlineLinkText>{' '} 100 - this account is stored on:{' '} 95 + This badge represents the Personal Data Server this account is 96 + stored on:{' '} 101 97 <InlineLinkText 102 98 to={pdsUrl} 103 99 label={displayName} 104 100 style={[a.text_md, a.font_semi_bold]}> 105 101 {displayName} 106 102 </InlineLinkText> 107 - {'. '}A PDS is where your posts, follows, and other data live on 108 - the AT Protocol network. 103 + . A PDS is where posts, follows, and other data live on the AT 104 + Protocol network. 109 105 </Trans> 110 106 </Text> 111 107 ··· 114 110 <Trans> 115 111 This account is bridged from the Fediverse via{' '} 116 112 <InlineLinkText 117 - to="https://fed.brid.gy" 113 + to="https://witchsky.app/profile/ap.brid.gy" 118 114 label="Bridgy Fed" 119 115 style={[a.text_md, a.font_semi_bold]}> 120 116 Bridgy Fed 121 117 </InlineLinkText> 122 - . Their original account lives on a Fediverse platform such as 123 - Mastodon. 118 + .{' '} 119 + {/* Their original account is avaiable at:{' '} 120 + <InlineLinkText 121 + to={BridgedUrl} 122 + label="Federated account address" 123 + style={[a.text_md, a.font_semi_bold]}> 124 + {BridgedUrl} 125 + </InlineLinkText> */} 124 126 </Trans> 125 127 </Text> 126 128 )} 127 129 128 - {isBsky && ( 130 + {!isBridged && ( 129 131 <Text style={[a.text_md, a.leading_snug]}> 130 132 <Trans> 131 - This account is hosted on one of Bluesky's first party PDS's. 132 - </Trans> 133 - </Text> 134 - )} 135 - 136 - {!isBsky && !isBridged && ( 137 - <Text style={[a.text_md, a.leading_snug]}> 138 - <Trans> 139 - This account is self-hosted or uses a third-party PDS provider. 133 + <InlineLinkText 134 + to="https://atproto.com/guides/glossary#pds-personal-data-server" 135 + label="PDS Glossary definition" 136 + style={[a.text_md, a.font_semi_bold]}> 137 + Learn more 138 + </InlineLinkText>{' '} 139 + about what a PDS is and how to{' '} 140 + <InlineLinkText 141 + to="https://atproto.com/guides/glossary#pds-personal-data-server" 142 + label="PDS Glossary definition" 143 + style={[a.text_md, a.font_semi_bold]}> 144 + self-host 145 + </InlineLinkText>{' '} 146 + your own. 140 147 </Trans> 141 148 </Text> 142 149 )}
+1 -1
src/state/persisted/schema.ts
··· 311 311 highQualityImages: false, 312 312 hideUnreplyablePosts: false, 313 313 pdsLabel: { 314 - enabled: false, 314 + enabled: true, 315 315 hideBskyPds: true, 316 316 }, 317 317 showExternalShareButtons: false,