jollywhoppers.com / witchsky.app
Bluesky app fork with some witchin' additions 💫 witchsky.app
bluesky fork client
fork atom

feat: mutuals pill/button from catsky.social #4

closed opened by vielle.dev targeting main
Labels

None yet.

assignee

None yet.

Participants 2
AT URI
at://did:plc:4zht3z4caxwrw3dlsybodywc/sh.tangled.repo.pull/3m6rnp27gky22
+6 -6
Interdiff #2 → #3
unified split
+3 -3
src/components/Pills.tsx
··· 177 </View> 178 ) 179 } 180 181 export function Mutuals({size = 'sm'}: CommonProps) { 182 const t = useTheme() ··· 201 <Text style={[a.text_xs, a.leading_tight]}> 202 <Trans>Mutuals</Trans> 203 </Text> 204 - </View> 205 - ) 206 - } 207 </View> 208 ) 209 }
··· 177 </View> 178 ) 179 } 180 + </View> 181 + ) 182 + } 183 184 export function Mutuals({size = 'sm'}: CommonProps) { 185 const t = useTheme() ··· 204 <Text style={[a.text_xs, a.leading_tight]}> 205 <Trans>Mutuals</Trans> 206 </Text> 207 </View> 208 ) 209 }
+3 -3
src/components/ProfileCard.tsx
··· 596 const moderation = moderateProfile(profile, moderationOpts) 597 const modui = moderation.ui('profileList') 598 const followedBy = profile.viewer?.followedBy 599 - const following = profile.viewer?.following 600 601 if (!followedBy && !modui.inform && !modui.alert) { 602 return null ··· 604 605 return ( 606 <Pills.Row style={[a.pt_xs]}> 607 - {followedBy && (following ? <Pills.Mutuals /> : <Pills.FollowsYou />)} 608 {modui.alerts.map(alert => ( 609 <Pills.Label key={getModerationCauseKey(alert)} cause={alert} /> 610 ))} ··· 626 const moderation = moderateProfile(profile, moderationOpts) 627 const modui = moderation.ui('profileList') 628 const followedBy = profile.viewer?.followedBy 629 630 if (!followedBy && !modui.inform && !modui.alert) { 631 return null ··· 633 634 return ( 635 <Pills.Row style={[a.pt_xs]}> 636 - {followedBy && <Pills.FollowsYou />} 637 {modui.alerts.map(alert => ( 638 <Pills.Label key={getModerationCauseKey(alert)} cause={alert} /> 639 ))}
··· 596 const moderation = moderateProfile(profile, moderationOpts) 597 const modui = moderation.ui('profileList') 598 const followedBy = profile.viewer?.followedBy 599 600 if (!followedBy && !modui.inform && !modui.alert) { 601 return null ··· 603 604 return ( 605 <Pills.Row style={[a.pt_xs]}> 606 + {followedBy && <Pills.FollowsYou />} 607 {modui.alerts.map(alert => ( 608 <Pills.Label key={getModerationCauseKey(alert)} cause={alert} /> 609 ))} ··· 625 const moderation = moderateProfile(profile, moderationOpts) 626 const modui = moderation.ui('profileList') 627 const followedBy = profile.viewer?.followedBy 628 + const following = profile.viewer?.following 629 630 if (!followedBy && !modui.inform && !modui.alert) { 631 return null ··· 633 634 return ( 635 <Pills.Row style={[a.pt_xs]}> 636 + {followedBy && (following ? <Pills.Mutuals /> : <Pills.FollowsYou />)} 637 {modui.alerts.map(alert => ( 638 <Pills.Label key={getModerationCauseKey(alert)} cause={alert} /> 639 ))}
src/screens/Profile/Header/Handle.tsx

This patch was likely rebased, as context lines do not match.

History

4 rounds 3 comments
sign up or login to add to the discussion
vielle.dev submitted #3
diff
1 commit
expand
6a0c100b
feat: mutuals pill
expand 2 comments
vielle.dev

finally lol

xan.lol

I'm going to push a commit that puts 'Mutuals' in place of the Following button instead, and just remove the "Follows you" pill from the labels section altogether. But thanks for submitting the PR!!

closed without merging
vielle.dev submitted #2
diff interdiff
1 commit
expand
365e9da5
feat: mutuals pill
expand 0 comments
vielle.dev submitted #1
diff interdiff
1 commit
expand
365e9da5
feat: mutuals pill
expand 0 comments
vielle.dev submitted #0
diff
1 commit
expand
ba43552d
fix(web): actually serve the manifest and pwa files when running go server
expand 1 comment
vielle.dev

wait thats the wrong patch 💀