A decentralized music tracking and discovery platform built on AT Protocol 🎵
rocksky.app
spotify
atproto
lastfm
musicbrainz
scrobbling
listenbrainz
[api] fix directory query (dropbox/googledrive)
+15
-2
+6
-1
apps/api/src/xrpc/app/rocksky/dropbox/getFiles.ts
+6
-1
apps/api/src/xrpc/app/rocksky/dropbox/getFiles.ts
···
1
1
import { HandlerAuth } from "@atproto/xrpc-server";
2
2
import { Context } from "context";
3
3
import { and, eq } from "drizzle-orm";
4
+
import { alias } from "drizzle-orm/pg-core";
4
5
import { Effect, pipe } from "effect";
5
6
import { Server } from "lexicon";
6
7
import { QueryParams } from "lexicon/types/app/rocksky/dropbox/getFiles";
···
50
51
eq(tables.dropbox.id, tables.dropboxDirectories.dropboxId)
51
52
)
52
53
.leftJoin(tables.users, eq(tables.dropbox.userId, tables.users.id))
54
+
.leftJoin(
55
+
alias(tables.dropboxDirectories, "parent"),
56
+
eq(tables.dropboxDirectories.id, tables.dropboxDirectories.parentId)
57
+
)
53
58
.where(
54
59
and(
55
60
eq(tables.users.did, did),
56
-
eq(tables.dropboxDirectories.path, params.at)
61
+
eq(alias(tables.dropboxDirectories, "parent").path, params.at)
57
62
)
58
63
)
59
64
.execute(),
+9
-1
apps/api/src/xrpc/app/rocksky/googledrive/getFiles.ts
+9
-1
apps/api/src/xrpc/app/rocksky/googledrive/getFiles.ts
···
1
1
import { Context } from "context";
2
2
import { and, eq } from "drizzle-orm";
3
+
import { alias } from "drizzle-orm/pg-core";
3
4
import { Effect, pipe } from "effect";
4
5
import { Server } from "lexicon";
5
6
import { QueryParams } from "lexicon/types/app/rocksky/googledrive/getFiles";
···
49
50
eq(tables.googleDrive.id, tables.googleDriveDirectories.googleDriveId)
50
51
)
51
52
.leftJoin(tables.users, eq(tables.googleDrive.userId, tables.users.id))
53
+
.leftJoin(
54
+
alias(tables.googleDriveDirectories, "parent"),
55
+
eq(
56
+
tables.googleDriveDirectories.id,
57
+
tables.googleDriveDirectories.parentId
58
+
)
59
+
)
52
60
.where(
53
61
and(
54
62
eq(tables.users.did, did),
55
-
eq(tables.googleDriveDirectories.path, params.at)
63
+
eq(alias(tables.googleDriveDirectories, "parent").path, params.at)
56
64
)
57
65
)
58
66
.execute(),