tangled
alpha
login
or
join now
robinwobin.dev
/
witchsky.app
forked from
jollywhoppers.com/witchsky.app
0
fork
atom
Bluesky app fork with some witchin' additions 💫
0
fork
atom
overview
issues
pulls
pipelines
fix: pds badge dialogs & default visibility
xan.lol
1 week ago
6b8364e6
045a68b5
verified
This commit was signed with the committer's
known signature
.
xan.lol
SSH Key Fingerprint:
SHA256:7Zs+dcly5YqxBg7v8XsE1uPMYCobHKBw7CDiNxpmSrY=
+42
-35
2 changed files
expand all
collapse all
unified
split
src
components
PdsDialog.tsx
state
persisted
schema.ts
+41
-34
src/components/PdsDialog.tsx
···
4
4
FontAwesomeIcon,
5
5
type FontAwesomeIconStyle,
6
6
} from '@fortawesome/react-native-fontawesome'
7
7
-
import {msg, Trans} from '@lingui/macro'
7
7
+
import {msg} from '@lingui/core/macro'
8
8
import {useLingui} from '@lingui/react'
9
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
14
+
import Svg, {G, Path, Rect} from 'react-native-svg'
15
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
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
78
-
{/*<Text
79
79
-
style={[a.text_2xl, a.font_semi_bold, a.leading_tight]}
80
80
-
numberOfLines={1}>
81
81
-
{displayName}
82
82
-
</Text>*/}
83
83
-
<Text style={[a.text_2xl, a.font_semi_bold, a.leading_tight]}>
84
84
-
{isBsky && <Trans>Bluesky-hosted PDS</Trans>}
85
85
-
{isBridged && <Trans>Fediverse bridge</Trans>}
86
86
-
{!isBsky && !isBridged && <Trans>Third-party PDS</Trans>}
80
80
+
{
81
81
+
<Text
82
82
+
style={[a.text_2xl, a.font_semi_bold, a.leading_tight]}
83
83
+
numberOfLines={1}>
84
84
+
{isBridged ? <Trans>Fediverse</Trans> : displayName}
85
85
+
</Text>
86
86
+
}
87
87
+
<Text style={[a.text_sm, a.leading_tight]}>
88
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
93
-
This badge represents the{' '}
94
94
-
<InlineLinkText
95
95
-
to={'https://atproto.com/guides/self-hosting'}
96
96
-
label={displayName}
97
97
-
style={[a.text_md, a.font_semi_bold]}>
98
98
-
Personal Data Server
99
99
-
</InlineLinkText>{' '}
100
100
-
this account is stored on:{' '}
95
95
+
This badge represents the Personal Data Server this account is
96
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
107
-
{'. '}A PDS is where your posts, follows, and other data live on
108
108
-
the AT Protocol network.
103
103
+
. A PDS is where posts, follows, and other data live on the AT
104
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
117
-
to="https://fed.brid.gy"
113
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
122
-
. Their original account lives on a Fediverse platform such as
123
123
-
Mastodon.
118
118
+
.{' '}
119
119
+
{/* Their original account is avaiable at:{' '}
120
120
+
<InlineLinkText
121
121
+
to={BridgedUrl}
122
122
+
label="Federated account address"
123
123
+
style={[a.text_md, a.font_semi_bold]}>
124
124
+
{BridgedUrl}
125
125
+
</InlineLinkText> */}
124
126
</Trans>
125
127
</Text>
126
128
)}
127
129
128
128
-
{isBsky && (
130
130
+
{!isBridged && (
129
131
<Text style={[a.text_md, a.leading_snug]}>
130
132
<Trans>
131
131
-
This account is hosted on one of Bluesky's first party PDS's.
132
132
-
</Trans>
133
133
-
</Text>
134
134
-
)}
135
135
-
136
136
-
{!isBsky && !isBridged && (
137
137
-
<Text style={[a.text_md, a.leading_snug]}>
138
138
-
<Trans>
139
139
-
This account is self-hosted or uses a third-party PDS provider.
133
133
+
<InlineLinkText
134
134
+
to="https://atproto.com/guides/glossary#pds-personal-data-server"
135
135
+
label="PDS Glossary definition"
136
136
+
style={[a.text_md, a.font_semi_bold]}>
137
137
+
Learn more
138
138
+
</InlineLinkText>{' '}
139
139
+
about what a PDS is and how to{' '}
140
140
+
<InlineLinkText
141
141
+
to="https://atproto.com/guides/glossary#pds-personal-data-server"
142
142
+
label="PDS Glossary definition"
143
143
+
style={[a.text_md, a.font_semi_bold]}>
144
144
+
self-host
145
145
+
</InlineLinkText>{' '}
146
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
314
-
enabled: false,
314
314
+
enabled: true,
315
315
hideBskyPds: true,
316
316
},
317
317
showExternalShareButtons: false,