mirror of https://github.com/usbharu/Hideout.git
Merge branch 'develop' into feature/block
This commit is contained in:
commit
9a6c1ca1bc
|
@ -110,7 +110,7 @@ object CustomEmojis : Table("emojis") {
|
||||||
val instanceId = long("instance_id").references(Instance.id).nullable()
|
val instanceId = long("instance_id").references(Instance.id).nullable()
|
||||||
val url = varchar("url", 255).uniqueIndex()
|
val url = varchar("url", 255).uniqueIndex()
|
||||||
val category = varchar("category", 255).nullable()
|
val category = varchar("category", 255).nullable()
|
||||||
val createdAt = timestamp("created_at").defaultExpression(CurrentTimestamp())
|
val createdAt = timestamp("created_at").defaultExpression(CurrentTimestamp)
|
||||||
|
|
||||||
override val primaryKey: PrimaryKey = PrimaryKey(id)
|
override val primaryKey: PrimaryKey = PrimaryKey(id)
|
||||||
|
|
||||||
|
|
|
@ -190,7 +190,7 @@ class RegisteredClientRepositoryImpl : RegisteredClientRepository {
|
||||||
object RegisteredClient : Table("registered_client") {
|
object RegisteredClient : Table("registered_client") {
|
||||||
val id: Column<String> = varchar("id", 100)
|
val id: Column<String> = varchar("id", 100)
|
||||||
val clientId: Column<String> = varchar("client_id", 100)
|
val clientId: Column<String> = varchar("client_id", 100)
|
||||||
val clientIdIssuedAt: Column<Instant> = timestamp("client_id_issued_at").defaultExpression(CurrentTimestamp())
|
val clientIdIssuedAt: Column<Instant> = timestamp("client_id_issued_at").defaultExpression(CurrentTimestamp)
|
||||||
val clientSecret: Column<String?> = varchar("client_secret", 200).nullable().default(null)
|
val clientSecret: Column<String?> = varchar("client_secret", 200).nullable().default(null)
|
||||||
val clientSecretExpiresAt: Column<Instant?> = timestamp("client_secret_expires_at").nullable().default(null)
|
val clientSecretExpiresAt: Column<Instant?> = timestamp("client_secret_expires_at").nullable().default(null)
|
||||||
val clientName: Column<String> = varchar("client_name", 200)
|
val clientName: Column<String> = varchar("client_name", 200)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
kotlin = "1.9.24"
|
kotlin = "1.9.24"
|
||||||
ktor = "2.3.9"
|
ktor = "2.3.9"
|
||||||
exposed = "0.49.0"
|
exposed = "0.50.1"
|
||||||
javacv-ffmpeg = "6.1.1-1.5.10"
|
javacv-ffmpeg = "6.1.1-1.5.10"
|
||||||
detekt = "1.23.6"
|
detekt = "1.23.6"
|
||||||
coroutines = "1.8.1"
|
coroutines = "1.8.1"
|
||||||
|
|
Loading…
Reference in New Issue