From 7fa87a6dfcfcdae520be6801a488a5591d50b1aa Mon Sep 17 00:00:00 2001 From: Lanius Trolling Date: Sun, 3 Mar 2024 17:17:26 -0500 Subject: [PATCH] Refactor some code --- fontparser/build.gradle.kts | 7 ------- src/jvmMain/kotlin/info/mechyrdia/auth/session_storage.kt | 7 ++----- src/jvmMain/kotlin/info/mechyrdia/data/comments.kt | 4 ++-- src/jvmMain/kotlin/info/mechyrdia/data/data.kt | 2 +- src/jvmMain/kotlin/info/mechyrdia/data/nations.kt | 2 +- src/jvmMain/kotlin/info/mechyrdia/data/views_comment.kt | 6 +++--- src/jvmMain/kotlin/info/mechyrdia/data/views_user.kt | 7 ++++--- src/jvmMain/kotlin/info/mechyrdia/data/visits.kt | 2 +- src/jvmMain/kotlin/info/mechyrdia/lore/parser_toc.kt | 2 +- 9 files changed, 15 insertions(+), 24 deletions(-) diff --git a/fontparser/build.gradle.kts b/fontparser/build.gradle.kts index ac45f8c..db7da6f 100644 --- a/fontparser/build.gradle.kts +++ b/fontparser/build.gradle.kts @@ -2,13 +2,6 @@ plugins { java } -repositories { - mavenCentral() -} - -dependencies { -} - java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) diff --git a/src/jvmMain/kotlin/info/mechyrdia/auth/session_storage.kt b/src/jvmMain/kotlin/info/mechyrdia/auth/session_storage.kt index ad09fb2..c8645d1 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/auth/session_storage.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/auth/session_storage.kt @@ -1,9 +1,6 @@ package info.mechyrdia.auth -import info.mechyrdia.data.DataDocument -import info.mechyrdia.data.DocumentTable -import info.mechyrdia.data.Id -import info.mechyrdia.data.TableHolder +import info.mechyrdia.data.* import io.ktor.server.sessions.* import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -24,7 +21,7 @@ object SessionStorageMongoDB : SessionStorage { @Serializable data class SessionStorageDoc( - @SerialName("_id") + @SerialName(MONGODB_ID_KEY) override val id: Id, val session: String ) : DataDocument { diff --git a/src/jvmMain/kotlin/info/mechyrdia/data/comments.kt b/src/jvmMain/kotlin/info/mechyrdia/data/comments.kt index 5ed70da..f97817a 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/data/comments.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/data/comments.kt @@ -10,7 +10,7 @@ import java.time.Instant @Serializable data class Comment( - @SerialName("_id") + @SerialName(MONGODB_ID_KEY) override val id: Id, val submittedBy: Id, @@ -42,7 +42,7 @@ data class Comment( @Serializable data class CommentReplyLink( - @SerialName("_id") + @SerialName(MONGODB_ID_KEY) override val id: Id = Id(), val originalPost: Id, diff --git a/src/jvmMain/kotlin/info/mechyrdia/data/data.kt b/src/jvmMain/kotlin/info/mechyrdia/data/data.kt index 481e09c..7aefc79 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/data/data.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/data/data.kt @@ -88,7 +88,7 @@ object ConnectionHolder { } interface DataDocument> { - @SerialName("_id") + @SerialName(MONGODB_ID_KEY) val id: Id } diff --git a/src/jvmMain/kotlin/info/mechyrdia/data/nations.kt b/src/jvmMain/kotlin/info/mechyrdia/data/nations.kt index 4bb5f21..15c12fe 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/data/nations.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/data/nations.kt @@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentHashMap @Serializable data class NationData( - @SerialName("_id") + @SerialName(MONGODB_ID_KEY) override val id: Id, val name: String, val flag: String, diff --git a/src/jvmMain/kotlin/info/mechyrdia/data/views_comment.kt b/src/jvmMain/kotlin/info/mechyrdia/data/views_comment.kt index 9cf308c..35cedfc 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/data/views_comment.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/data/views_comment.kt @@ -98,7 +98,7 @@ suspend fun ApplicationCall.newCommentRoute(): Nothing { } suspend fun ApplicationCall.viewCommentRoute(): Nothing { - val commentId = Id(parameters["id"]!!) + val commentId = Id(parameters.getOrFail("id")) val comment = Comment.Table.get(commentId)!! @@ -116,7 +116,7 @@ suspend fun ApplicationCall.viewCommentRoute(): Nothing { } suspend fun ApplicationCall.editCommentRoute(): Nothing { - val commentId = Id(parameters["id"]!!) + val commentId = Id(parameters.getOrFail("id")) val oldComment = Comment.Table.get(commentId)!! @@ -150,7 +150,7 @@ suspend fun ApplicationCall.editCommentRoute(): Nothing { private suspend fun ApplicationCall.getCommentForDeletion(): Pair { val currNation = currentNation() ?: redirectWithError("/auth/login", "You must be logged in to delete comments") - val commentId = Id(parameters["id"]!!) + val commentId = Id(parameters.getOrFail("id")) val comment = Comment.Table.get(commentId)!! if (currNation.id != comment.submittedBy && currNation.id != OwnerNationId) diff --git a/src/jvmMain/kotlin/info/mechyrdia/data/views_user.kt b/src/jvmMain/kotlin/info/mechyrdia/data/views_user.kt index 3d79c29..eefd542 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/data/views_user.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/data/views_user.kt @@ -9,12 +9,13 @@ import info.mechyrdia.lore.page import info.mechyrdia.lore.redirect import info.mechyrdia.lore.standardNavBar import io.ktor.server.application.* +import io.ktor.server.util.* import kotlinx.coroutines.flow.toList import kotlinx.html.* suspend fun ApplicationCall.userPage(): HTML.() -> Unit { val currNation = currentNation() - val viewingNation = nationCache.getNation(Id(parameters["id"]!!)) + val viewingNation = nationCache.getNation(Id(parameters.getOrFail("id"))) val comments = CommentRenderData( Comment.getCommentsBy(viewingNation.id).toList(), @@ -53,7 +54,7 @@ suspend fun ApplicationCall.adminBanUserRoute(): Nothing { ownerNationOnly() verifyCsrfToken() - val bannedNation = nationCache.getNation(Id(parameters["id"]!!)) + val bannedNation = nationCache.getNation(Id(parameters.getOrFail("id"))) if (!bannedNation.isBanned) NationData.Table.set(bannedNation.id, Updates.set(NationData::isBanned.serialName, true)) @@ -65,7 +66,7 @@ suspend fun ApplicationCall.adminUnbanUserRoute(): Nothing { ownerNationOnly() verifyCsrfToken() - val bannedNation = nationCache.getNation(Id(parameters["id"]!!)) + val bannedNation = nationCache.getNation(Id(parameters.getOrFail("id"))) if (bannedNation.isBanned) NationData.Table.set(bannedNation.id, Updates.set(NationData::isBanned.serialName, false)) diff --git a/src/jvmMain/kotlin/info/mechyrdia/data/visits.kt b/src/jvmMain/kotlin/info/mechyrdia/data/visits.kt index 4ab2a91..7c1de93 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/data/visits.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/data/visits.kt @@ -28,7 +28,7 @@ data class PageVisitTotals( @Serializable data class PageVisitData( - @SerialName("_id") + @SerialName(MONGODB_ID_KEY) override val id: Id = Id(), val path: String, diff --git a/src/jvmMain/kotlin/info/mechyrdia/lore/parser_toc.kt b/src/jvmMain/kotlin/info/mechyrdia/lore/parser_toc.kt index bc58291..fda0e86 100644 --- a/src/jvmMain/kotlin/info/mechyrdia/lore/parser_toc.kt +++ b/src/jvmMain/kotlin/info/mechyrdia/lore/parser_toc.kt @@ -96,7 +96,7 @@ enum class TextParserToCBuilderTag(val type: TextParserTagType + TextParserTagType.Indirect(false) { _, content, builder -> builder.addImage(imagePathToOpenGraphValue(content)) "" } -- 2.25.1