Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/features/music/loader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,21 @@ export const musicUserLoader = createLoader(async ({ db, params, request }) => {
const UserMusicMemo = await db.userMusicMemo.findFirst({ where: { userId, songId } });

const spotifyEmbed = song?.spotifyId ? await getSpotifyEmbed(buildSpotifyTrackUrl(song.spotifyId)) : null;
const likes = await db.memoLikesUser.count({
where: { memoId: UserMusicMemo?.id },
});
const isMemoLiked = !!(await db.memoLikesUser.findFirst({
where: { memoId: UserMusicMemo?.id, userId: currentUser?.id },
}));

return { song, user, UserMusicMemo, isCurrentUserProfile, spotifyEmbed, isMemoLiked };
return {
song,
user,
UserMusicMemo: UserMusicMemo ? { ...UserMusicMemo, likes } : null,
isCurrentUserProfile,
spotifyEmbed,
isMemoLiked,
};
});

export const musicCreateUserLoader = createLoader(async ({ db, params, request }) => {
Expand Down
8 changes: 0 additions & 8 deletions app/features/profile/action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,7 @@ export const MemoLikeAction = createAction(async ({ request, db, params }) => {
},
update: {},
});
await db.userMusicMemo.update({
where: { id: memoId },
data: { likes: { increment: 1 } },
});
} else if (intent === 'unlike') {
await db.userMusicMemo.update({
where: { id: memoId },
data: { likes: { decrement: 1 } },
});
await db.memoLikesUser.delete({
where: {
userId_memoId: {
Expand Down