Allow for longer filenames when sharing files

Updated Kotlin version
Perpheads · Mar 19, 2023 · 2c63861 · 2c63861
1 parent e965180
commit 2c63861
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 22 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    kotlin("multiplatform") version "1.8.0" apply false
-    kotlin("plugin.serialization") version "1.8.0" apply false
+    kotlin("multiplatform") version "1.8.10" apply false
+    kotlin("plugin.serialization") version "1.8.10" apply false
 }
 
 allprojects {

diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     kotlin("plugin.serialization")
 }
 
-val kotlinWrappersVersion = "1.0.0-pre.479"
+val kotlinWrappersVersion = "1.0.0-pre.515"
 
 kotlin {
     js(IR) {

diff --git a/client/src/main/kotlin/App.kt b/client/src/main/kotlin/App.kt
@@ -12,11 +12,8 @@ import mui.material.styles.ThemeProvider
 import mui.material.styles.createTheme
 import react.*
 import react.dom.client.createRoot
-import react.router.NavigateFunction
-import react.router.Route
-import react.router.Routes
+import react.router.*
 import react.router.dom.HashRouter
-import react.router.useNavigate
 import web.dom.document
 import web.window.window
 
@@ -63,7 +60,7 @@ fun useScope(): CoroutineScope {
 }
 
 fun useAccount(required: Boolean = true): Pair<AccountInfoV2?, StateSetter<AccountInfoV2?>> {
-    val contextData = useContext(AccountContext)
+    val contextData = useContext(AccountContext)!!
     val navigate = useNavigate()
 
     useEffectOnce {
@@ -90,6 +87,13 @@ fun useAccount(required: Boolean = true): Pair<AccountInfoV2?, StateSetter<Accou
     return contextData.account to contextData.setAccount
 }
 
+private fun ChildrenBuilder.route(builder: (PathRouteProps).() -> Unit) {
+    Route {
+        @Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE")
+        builder(this as PathRouteProps)
+    }
+}
+
 val App = VFC {
     val (account, setAccount) = useState<AccountInfoV2?>(null)
 
@@ -112,39 +116,39 @@ val App = VFC {
             theme = usedTheme
             HashRouter {
                 Routes {
-                    Route {
+                    route {
                         path = "/account"
                         element = createElement(AccountPageComponent)
                     }
-                    Route {
+                    route {
                         path = "/change-password"
                         element = createElement(ChangePasswordComponent)
                     }
-                    Route {
+                    route {
                         path = "/api-key"
                         element = createElement(ApiKeyComponent)
                     }
-                    Route {
+                    route {
                         path = "/share"
                         element = createElement(ShareComponent)
                     }
-                    Route {
+                    route {
                         path = "/create-account"
                         element = createElement(CreateAccountComponent)
                     }
-                    Route {
+                    route {
                         path = "/share/:token"
                         element = createElement(ShareDownloadComponent)
                     }
-                    Route {
+                    route {
                         path = "/contact"
                         element = createElement(ContactComponent)
                     }
-                    Route {
+                    route {
                         path = "/statistics"
                         element = createElement(StatisticsPage)
                     }
-                    Route {
+                    route {
                         path = "/"
                         element = createElement(LoginPageComponent)
                     }

diff --git a/client/src/main/kotlin/WebSocketSender.kt b/client/src/main/kotlin/WebSocketSender.kt
@@ -33,7 +33,7 @@ class WebSocketSender(private val path: String, private val file: File, private
         onProgress(0)
         sendJob = scope.launch {
             var sent = 0.0
-            while (sent < file.size.toDouble()) {
+            while (sent < file.size) {
                 tokenChannel.receive()
                 val end = (sent + chunkSize).coerceAtMost(file.size)
                 socket.send(file.slice(sent, end))

diff --git a/client/src/main/kotlin/components/ChangePasswordComponent.kt b/client/src/main/kotlin/components/ChangePasswordComponent.kt
@@ -9,12 +9,12 @@ import mui.material.*
 import mui.system.sx
 import react.Props
 import react.ReactNode
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML
 import react.dom.onChange
 import react.fc
 import react.router.useNavigate
 import react.useState
+import web.html.ButtonType
 
 val ChangePasswordComponent = fc<Props>("ChangePasswordComponent") {
     val navigate = useNavigate()

diff --git a/client/src/main/kotlin/components/CreateAccountComponent.kt b/client/src/main/kotlin/components/CreateAccountComponent.kt
@@ -12,6 +12,7 @@ import react.*
 import react.dom.html.ReactHTML
 import react.dom.onChange
 import react.router.useNavigate
+import web.html.ButtonType
 
 external interface CreateAccountProps : Props {
     var showAlert: (String, AlertColor) -> Unit
@@ -105,7 +106,7 @@ val CreateAccountComponent = fc<CreateAccountProps>("CreateAccountComponent") {p
 
             Button {
                 attrs {
-                    type = react.dom.html.ButtonType.submit
+                    type = ButtonType.submit
                     fullWidth = true
                     variant = ButtonVariant.contained
                     sx {

diff --git a/client/src/main/kotlin/components/LoginComponent.kt b/client/src/main/kotlin/components/LoginComponent.kt
@@ -13,14 +13,14 @@ import mui.material.styles.TypographyVariant
 import mui.material.styles.useTheme
 import mui.system.sx
 import react.*
-import react.dom.html.ButtonType
 import react.dom.html.ReactHTML
 import react.dom.html.ReactHTML.form
 import react.dom.html.ReactHTML.h1
 import react.dom.html.ReactHTML.main
 import react.dom.onChange
 import react.router.Navigate
 import react.router.useNavigate
+import web.html.ButtonType
 import web.html.HTMLInputElement
 import web.html.InputType
 

diff --git a/server/src/main/kotlin/controllers/ShareController.kt b/server/src/main/kotlin/controllers/ShareController.kt
@@ -108,7 +108,7 @@ fun Route.shareRoutes() {
                 return@webSocket
             }
             val announceMessage = Json.decodeFromString<AnnounceMessage>(announceFrame.data.decodeToString())
-            if (!validateFilename(announceMessage.fileName) || announceMessage.fileName.length !in 2..50) {
+            if (!validateFilename(announceMessage.fileName) || announceMessage.fileName.length !in 2..150) {
                 logger.warn("User $userId attempted share session with invalid filename: ${announceMessage.fileName}")
                 val errorMessage =
                     Json.encodeToString<ShareWebSocketMessage>(ErrorMessage("Invalid filename"))