Merge develop

src/UI/InputElement/ValidatedInput.svelte

@@ -67,7 +67,7 @@
             return
         }
 
-        if (unit && isNaN(Number(v))) {
+        if (unit !== undefined && isNaN(Number(v))) {
             value.setData(undefined)
             return
         }
@@ -75,6 +75,7 @@
         feedback?.setData(undefined)
         value.setData(v + (selectedUnit.data ?? ""))
     }
+        
 
     onDestroy(_value.addCallbackAndRun((_) => setValues()))
     onDestroy(value.addCallbackAndRunD(fromUpstream => {

src/UI/InputElement/Validator.ts

@@ -1,6 +1,6 @@
-import BaseUIElement from "../BaseUIElement"
-import { Translation } from "../i18n/Translation"
-import Translations from "../i18n/Translations"
+import BaseUIElement from "../BaseUIElement";
+import { Translation } from "../i18n/Translation";
+import Translations from "../i18n/Translations";
 
 /**
  * A 'TextFieldValidator' contains various methods to check and cleanup an entered value or to give feedback.
@@ -16,13 +16,13 @@ export abstract class Validator {
     /**
      * What HTML-inputmode to use
      */
-    public readonly inputmode?: string
+    public readonly inputmode?: 'none' | 'text' | 'tel' | 'url' | 'email' | 'numeric' | 'decimal' | 'search'
     public readonly textArea: boolean
 
     constructor(
         name: string,
         explanation: string | BaseUIElement,
-        inputmode?: string,
+        inputmode?: 'none' | 'text' | 'tel' | 'url' | 'email' | 'numeric' | 'decimal' | 'search',
         textArea?: false | boolean
     ) {
         this.name = name

src/UI/InputElement/Validators.ts

@@ -22,6 +22,7 @@ import SimpleTagValidator from "./Validators/SimpleTagValidator"
 import ImageUrlValidator from "./Validators/ImageUrlValidator"
 import TagKeyValidator from "./Validators/TagKeyValidator"
 import TranslationValidator from "./Validators/TranslationValidator"
+import FediverseValidator from "./Validators/FediverseValidator"
 
 export type ValidatorType = (typeof Validators.availableTypes)[number]
 
@@ -47,6 +48,7 @@ export default class Validators {
         "simple_tag",
         "key",
         "translation",
+        "fediverse",
     ] as const
 
     public static readonly AllValidators: ReadonlyArray<Validator> = [
@@ -70,6 +72,7 @@ export default class Validators {
         new SimpleTagValidator(),
         new TagKeyValidator(),
         new TranslationValidator(),
+        new FediverseValidator(),
     ]
 
     private static _byType = Validators._byTypeConstructor()

src/UI/InputElement/Validators/FediverseValidator.ts

@@ -0,0 +1,63 @@
+import {Validator} from "../Validator"
+import {Translation} from "../../i18n/Translation";
+import Translations from "../../i18n/Translations";
+
+export default class FediverseValidator extends Validator {
+
+    public static readonly usernameAtServer: RegExp = /^@?(\w+)@((\w|\.)+)$/
+
+    constructor() {
+        super("fediverse", "Validates fediverse addresses and normalizes them into `@username@server`-format");
+    }
+
+    /**
+     * Returns an `@username@host`
+     * @param s
+     */
+    reformat(s: string): string {
+        if(!s.startsWith("@")){
+            s = "@"+s
+        }
+        if (s.match(FediverseValidator.usernameAtServer)) {
+            return s
+        }
+        try {
+            const url = new URL(s)
+            const path = url.pathname
+            if (path.match(/^\/\w+$/)) {
+                return `@${path.substring(1)}@${url.hostname}`;
+            }
+        } catch (e) {
+            // Nothing to do here
+        }
+        return undefined
+    }
+getFeedback(s: string): Translation | undefined {
+    const match = s.match(FediverseValidator.usernameAtServer)
+    console.log("Match:", match)
+    if (match) {
+        const host = match[2]
+        try {
+            const url = new URL("https://" + host)
+            return undefined
+        } catch (e) {
+            return Translations.t.validation.fediverse.invalidHost.Subs({host})
+        }
+    }
+    try {
+        const url = new URL(s)
+        const path = url.pathname
+        if (path.match(/^\/\w+$/)) {
+            return undefined
+        }
+    } catch (e) {
+        // Nothing to do here
+    }
+    return Translations.t.validation.fediverse.feedback
+}
+
+    isValid(s): boolean {
+      return this.getFeedback(s) === undefined
+
+    }
+}

src/UI/InputElement/Validators/FloatValidator.ts

@@ -1,11 +1,12 @@
 import { Translation } from "../../i18n/Translation"
 import Translations from "../../i18n/Translations"
 import { Validator } from "../Validator"
+import { ValidatorType } from "../Validators";
 
 export default class FloatValidator extends Validator {
-    inputmode = "decimal"
+    inputmode: "decimal" = "decimal"
 
-    constructor(name?: string, explanation?: string) {
+    constructor(name?: ValidatorType, explanation?: string) {
         super(name ?? "float", explanation ?? "A decimal number", "decimal")
     }