Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-09 20:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Instance and account form and validation improvements

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-12-17 15:57:59 +01:00
parent 9f3a94137c
commit cf0572a94b
4 changed files with 109 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Model/Accounts/AccountValidator.swift
View File

@@ -82,14 +82,24 @@ final class AccountValidator: Service {
}
guard !response.json.isEmpty else {
guard let app = self.appsToValidateInstance.popLast() else {
if app == .piped {
if response.text.contains("property=\"og:title\" content=\"Piped\"") {
self.isValid.wrappedValue = false
self.isValidated.wrappedValue = true
self.isValidating.wrappedValue = false
self.error?.wrappedValue = "Trying to use Piped front-end URL, you need to use URL for Piped API instead"
return
}
}
guard let nextApp = self.appsToValidateInstance.popLast() else {
self.isValid.wrappedValue = false
self.isValidated.wrappedValue = true
self.isValidating.wrappedValue = false
return
}
self.tryValidatingUsing(app)
self.tryValidatingUsing(nextApp)
return
}
@@ -128,15 +138,15 @@ final class AccountValidator: Service {
switch app.wrappedValue {
case .invidious:
invidiousValidation()
validateInvidiousAccount()
case .piped:
pipedValidation()
validatePipedAccount()
default:
setValidationResult(false)
}
}
func invidiousValidation() {
func validateInvidiousAccount() {
guard let username = account?.username,
let password = account?.password
else {
@@ -177,7 +187,7 @@ final class AccountValidator: Service {
}
}
func pipedValidation() {
func validatePipedAccount() {
guard let request = accountRequest else {
setValidationResult(false)