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

couple code error fixes #38

merged opened by daniela.lol targeting main from daniela.lol/witchsky.app: main

most importantly fixes not being able to view profiles, unsure why u cant post just yet but i have an idea on what might be causing it

Labels

None yet.

assignee

None yet.

Participants 2
AT URI
at://did:plc:x3vdwseoxbzbp2dfv7q3brqn/sh.tangled.repo.pull/3mcnwnrr2q222
+16 -9
Diff #1
unified split
+4 -2
src/lib/media/video/upload.shared.ts
··· 3 3 import {msg} from '@lingui/macro' 4 4 5 5 import {VIDEO_SERVICE_DID} from '#/lib/constants' 6 - import {pdsAgent} from '#/state/session/agent' 7 6 import {UploadLimitError} from '#/lib/media/video/errors' 8 7 import {getServiceAuthAudFromUrl} from '#/lib/strings/url-helpers' 8 + import {pdsAgent} from '#/state/session/agent' 9 9 import {createVideoAgent} from './util' 10 10 11 11 export async function getServiceAuthToken({ ··· 23 23 if (!pdsAud) { 24 24 throw new Error('Agent does not have a PDS URL') 25 25 } 26 - const {data: serviceAuth} = await pdsAgent(agent).com.atproto.server.getServiceAuth({ 26 + const {data: serviceAuth} = await pdsAgent( 27 + agent, 28 + ).com.atproto.server.getServiceAuth({ 27 29 aud: aud ?? pdsAud, 28 30 lxm, 29 31 exp,
+5 -5
src/screens/Profile/Header/Shell.tsx
··· 1 1 import {memo, useCallback, useEffect, useMemo} from 'react' 2 - import {Pressable, View} from 'react-native' 2 + import {Pressable, TouchableWithoutFeedback, View} from 'react-native' 3 3 import Animated, { 4 4 measure, 5 5 type MeasuredDimensions, ··· 169 169 runOnUI(() => { 170 170 'worklet' 171 171 const rect = measure(aviRef) 172 - runOnJS(_openLightboxAvi)(avatar, rect) 172 + runOnJS(_openLightbox)(avatar, rect) 173 173 })() 174 174 } 175 175 } 176 176 }, [ 177 177 profile, 178 178 moderation, 179 - _openLightboxAvi, 179 + _openLightbox, 180 180 aviRef, 181 181 liveStatusControl, 182 182 live, ··· 190 190 runOnUI(() => { 191 191 'worklet' 192 192 const rect = measure(bannerRef) 193 - runOnJS(_openLightbox)(banner, rect, 'image') 193 + runOnJS(_openLightboxBanner)(banner, rect, 'image') 194 194 })() 195 195 } 196 - }, [profile.banner, moderation, _openLightbox, bannerRef]) 196 + }, [profile.banner, moderation, _openLightboxBanner, bannerRef]) 197 197 198 198 return ( 199 199 <View style={t.atoms.bg} pointerEvents={isIOS ? 'auto' : 'box-none'}>
+6 -1
src/screens/Signup/StepInfo/index.tsx
··· 8 8 import {DEFAULT_SERVICE} from '#/lib/constants' 9 9 import {isEmailMaybeInvalid} from '#/lib/strings/email' 10 10 import {logger} from '#/logger' 11 - import {isNative} from '#/platform/detection' 11 + import {isNative, isWeb} from '#/platform/detection' 12 12 import {useSignupContext} from '#/screens/Signup/state' 13 13 import {Policies} from '#/screens/Signup/StepInfo/Policies' 14 14 import {atoms as a, native} from '#/alf' 15 15 import * as Admonition from '#/components/Admonition' 16 + import {Button, ButtonText} from '#/components/Button' 16 17 import * as Dialog from '#/components/Dialog' 17 18 import {DeviceLocationRequestDialog} from '#/components/dialogs/DeviceLocationRequestDialog' 19 + import {Divider} from '#/components/Divider' 18 20 import * as DateField from '#/components/forms/DateField' 19 21 import {type DateFieldRef} from '#/components/forms/DateField/types' 20 22 import {FormError} from '#/components/forms/FormError' ··· 23 25 import {Envelope_Stroke2_Corner0_Rounded as Envelope} from '#/components/icons/Envelope' 24 26 import {Lock_Stroke2_Corner0_Rounded as Lock} from '#/components/icons/Lock' 25 27 import {Ticket_Stroke2_Corner0_Rounded as Ticket} from '#/components/icons/Ticket' 28 + import {SimpleInlineLinkText as InlineLinkText} from '#/components/Link' 26 29 import {createStaticClick, SimpleInlineLinkText} from '#/components/Link' 27 30 import {Loader} from '#/components/Loader' 28 31 import {usePreemptivelyCompleteActivePolicyUpdate} from '#/components/PolicyUpdateOverlay/usePreemptivelyCompleteActivePolicyUpdate' 32 + import {ScreenTransition} from '#/components/ScreenTransition' 29 33 import * as Toast from '#/components/Toast' 34 + import {Text} from '#/components/Typography' 30 35 import { 31 36 isUnderAge, 32 37 MIN_ACCESS_AGE,
+1 -1
src/view/com/profile/ProfileMenu.tsx
··· 15 15 import {isWeb} from '#/platform/detection' 16 16 import {type Shadow} from '#/state/cache/types' 17 17 import {useModalControls} from '#/state/modals' 18 - import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs' 19 18 import { 20 19 useDeerVerificationEnabled, 21 20 useDeerVerificationTrusted, 22 21 useSetDeerVerificationTrust, 23 22 } from '#/state/preferences/deer-verification' 24 23 import {useEnableSquareButtons} from '#/state/preferences/enable-square-buttons' 24 + import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs' 25 25 import { 26 26 RQKEY as profileQueryKey, 27 27 useProfileBlockMutationQueue,

History

2 rounds 4 comments
sign up or login to add to the discussion
daniela.lol submitted #1
interdiff
1 commit
expand
08593341
couple code error fixes
expand 0 comments
pull request successfully merged
daniela.lol submitted #0
diff
2 commits
expand
b9f4ecd9
revert "pdsAgent" change from age assurance
834f5351
couple code error fixes
expand 4 comments
daniela.lol

whuh, merge conflicts? my repo is up to date tho what

daniela.lol

oh for some reason my pull request is trying to do the revert pdsagent one again??? that was merged tho wtf tangled

xan.lol

for the can't post part, I'm wondering if it's fixed by an upstream issue? was just about to work through over 30 merge conflicts for a git merge but I think I'll merge this first.

daniela.lol

are u able to merge or are the "conflicts" that arent even supposed to exist stopping it?