From 15aaa333740263b412df3f4925ace90f924c7126 Mon Sep 17 00:00:00 2001 From: pieterdd Date: Sun, 15 Oct 2023 23:26:05 +0200 Subject: [PATCH] Simplify login screen - Only warn about the minimum instance version if there may be a compatibility issue - Remove username placeholder because it's not communicating new information - Remove subtitle to improve signal-to-noise ratio --- src/lib/lemmy.ts | 25 +++++++++++++++++++++++++ src/routes/login/+page.svelte | 21 ++++++++++----------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index 66bf743b..70b305e3 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -99,3 +99,28 @@ export async function validateInstance(instance: string): Promise { return false } } + +export function mayBeIncompatible(minVersion: string, availableVersion: string) { + if (minVersion.valueOf() === availableVersion.valueOf()) return false; + + const versionFormatter = /[\d.]/; + if (!minVersion.match(versionFormatter) || !availableVersion.match(availableVersion)) { + return true; + } + + const splitMinVersion = minVersion.split('.'); + const splitAvailableVersion = availableVersion.split('.'); + + if (splitMinVersion.length !== splitAvailableVersion.length) return true; + + for (let i = 0; i < splitMinVersion.length; ++i) { + const minVersionDigit = parseInt(splitMinVersion[i]); + const availableVersionDigit = parseInt(splitAvailableVersion[i]); + + if (availableVersionDigit === undefined) return true; + if (minVersionDigit < availableVersionDigit) return false; + if (availableVersionDigit < minVersionDigit) return true; + } + + return false; +} diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index e16a6f62..247d149e 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -3,10 +3,9 @@ import { setUser } from '$lib/auth.js' import { Note, toast } from 'mono-svelte' import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js' - import { getClient, validateInstance } from '$lib/lemmy.js' + import { getClient, mayBeIncompatible, site, validateInstance } from '$lib/lemmy.js' import { Button, TextInput } from 'mono-svelte' import { - AtSymbol, Icon, Identification, QuestionMarkCircle, @@ -65,21 +64,21 @@

Log In

-

Enter the fediverse

- - This version of Photon supports instances running - - v{MINIMUM_VERSION} - - or higher. - + {#if $site && mayBeIncompatible(MINIMUM_VERSION, $site.version.replace("v", ""))} + + This version of Photon supports instances running + + v{MINIMUM_VERSION} + + or higher. + + {/if}