- storing changes for now
This commit is contained in:
@@ -8,6 +8,7 @@ import { checkIsHotListHit, getNPEDCategory, getSoundFileURL } from "../utils/ut
|
||||
import switchSound from "../assets/sounds/ui/switch.mp3";
|
||||
import notification from "../assets/sounds/ui/notification.mp3";
|
||||
import popup from "../assets/sounds/ui/popup_open.mp3";
|
||||
import { useFileUpload } from "./useFileUpload";
|
||||
|
||||
async function fetchSighting(url: string | undefined, ref: number): Promise<SightingType> {
|
||||
const res = await fetch(`${url}${ref}`, {
|
||||
@@ -18,12 +19,22 @@ async function fetchSighting(url: string | undefined, ref: number): Promise<Sigh
|
||||
}
|
||||
|
||||
export function useSightingFeed(url: string | undefined) {
|
||||
const { state, audioArmed } = useSoundContext();
|
||||
const { state, audioArmed, dispatch } = useSoundContext();
|
||||
const [sightings, setSightings] = useState<SightingType[]>([]);
|
||||
const [selectedRef, setSelectedRef] = useState<number | null>(null);
|
||||
const [sessionStarted, setSessionStarted] = useState(false);
|
||||
const [selectedSighting, setSelectedSighting] = useState<SightingType | null>(null);
|
||||
|
||||
const isUploaded = state?.sightingSound?.endsWith(".mp3") || state?.sightingSound?.endsWith(".wav");
|
||||
|
||||
const fileName = isUploaded ? state.sightingSound : switchSound;
|
||||
|
||||
const { query: fileQuery } = useFileUpload({
|
||||
queryKey: fileName ? [fileName] : undefined,
|
||||
});
|
||||
|
||||
const objUrlRef = useRef<string | null>(null);
|
||||
|
||||
const soundSrcHotlist = useMemo(() => {
|
||||
if (state?.hotlistSound?.includes(".mp3") || state.hotlistSound?.includes(".wav")) {
|
||||
const file = state.soundOptions?.find((item) => item.name === state.hotlistSound);
|
||||
@@ -41,12 +52,20 @@ export function useSightingFeed(url: string | undefined) {
|
||||
}, [state.NPEDsound, state.soundOptions]);
|
||||
|
||||
const soundSrc = useMemo(() => {
|
||||
if (state?.sightingSound?.includes(".mp3") || state.sightingSound?.includes(".wav")) {
|
||||
const file = state.soundOptions?.find((item) => item.name === state.sightingSound);
|
||||
return file?.soundUrl ?? switchSound;
|
||||
if (isUploaded && fileQuery?.data instanceof Blob) {
|
||||
if (objUrlRef.current) URL.revokeObjectURL(objUrlRef.current);
|
||||
objUrlRef.current = URL.createObjectURL(fileQuery.data);
|
||||
console.log(fileQuery.data);
|
||||
return objUrlRef.current;
|
||||
}
|
||||
return getSoundFileURL(state?.sightingSound) ?? switchSound;
|
||||
}, [state.sightingSound, state.soundOptions]);
|
||||
}, [isUploaded, fileQuery?.data, state?.sightingSound]);
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
if (objUrlRef.current) URL.revokeObjectURL(objUrlRef.current);
|
||||
};
|
||||
}, []);
|
||||
|
||||
const { play: hotlistsound } = useSound(soundSrcHotlist, { volume: state.hotlistSoundVolume });
|
||||
const { play: npedSound } = useSound(soundSrcNped, { volume: state.NPEDsoundVolume });
|
||||
|
||||
Reference in New Issue
Block a user