Bluesky app fork with some witchin' additions ๐Ÿ’ซ witchsky.app
bluesky fork client

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
+3 -3
src/components/Pills.tsx
··· 177 177 </View> 178 178 ) 179 179 } 180 + </View> 181 + ) 182 + } 180 183 181 184 export function Mutuals({size = 'sm'}: CommonProps) { 182 185 const t = useTheme() ··· 201 204 <Text style={[a.text_xs, a.leading_tight]}> 202 205 <Trans>Mutuals</Trans> 203 206 </Text> 204 - </View> 205 - ) 206 - } 207 207 </View> 208 208 ) 209 209 }
+3 -3
src/components/ProfileCard.tsx
··· 596 596 const moderation = moderateProfile(profile, moderationOpts) 597 597 const modui = moderation.ui('profileList') 598 598 const followedBy = profile.viewer?.followedBy 599 - const following = profile.viewer?.following 600 599 601 600 if (!followedBy && !modui.inform && !modui.alert) { 602 601 return null ··· 604 603 605 604 return ( 606 605 <Pills.Row style={[a.pt_xs]}> 607 - {followedBy && (following ? <Pills.Mutuals /> : <Pills.FollowsYou />)} 606 + {followedBy && <Pills.FollowsYou />} 608 607 {modui.alerts.map(alert => ( 609 608 <Pills.Label key={getModerationCauseKey(alert)} cause={alert} /> 610 609 ))} ··· 626 625 const moderation = moderateProfile(profile, moderationOpts) 627 626 const modui = moderation.ui('profileList') 628 627 const followedBy = profile.viewer?.followedBy 628 + const following = profile.viewer?.following 629 629 630 630 if (!followedBy && !modui.inform && !modui.alert) { 631 631 return null ··· 633 633 634 634 return ( 635 635 <Pills.Row style={[a.pt_xs]}> 636 - {followedBy && <Pills.FollowsYou />} 636 + {followedBy && (following ? <Pills.Mutuals /> : <Pills.FollowsYou />)} 637 637 {modui.alerts.map(alert => ( 638 638 <Pills.Label key={getModerationCauseKey(alert)} cause={alert} /> 639 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
1 commit
expand
6a0c100b
feat: mutuals pill
expand 2 comments

finally 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
1 commit
expand
365e9da5
feat: mutuals pill
expand 0 comments
1 commit
expand
365e9da5
feat: mutuals pill
expand 0 comments
1 commit
expand
ba43552d
fix(web): actually serve the manifest and pwa files when running go server
expand 1 comment

wait thats the wrong patch ๐Ÿ’€