Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
mirror of https://github.com/h3poteto/whalebird-desktop synced 2025-02-06 04:13:36 +01:00
Code Issues Releases Wiki Activity

Merge pull request #3775 from sfabel/master

Browse Source 
update domainFormat validation to accept single character domains like c.im
This commit is contained in:
AkiraFukushima 2022-11-13 21:18:02 +09:00 committed by GitHub
commit 0c4b49cc1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spec/renderer/unit/utils/validator.spec.ts
View File

@ -2,6 +2,13 @@ import { domainFormat } from '@/utils/validator'
describe('validator', () => {
describe('domainFormat', () => {
describe('single character domain name', () => {
const domain = 'c.im'
it('should match', () => {
const res = domain.search(domainFormat)
expect(res).toEqual(0)
})
})
describe('string contains protocol', () => {
const domain = 'https://mastodon.social'
it('should not match', () => {

3
src/renderer/utils/validator.ts
View File

@ -1 +1,2 @@
export const domainFormat = /^[a-zA-Z0-9][a-zA-Z0-9-.]{0,61}[a-zA-Z0-9]\.[a-zA-Z0-9]{2,}$/
// eslint-disable-next-line
export const domainFormat = /^(((?!\-))(xn\-\-)?[a-z0-9\-_]{0,61}[a-z0-9]{1,1}\.)*(xn\-\-)?([a-z0-9\-]{1,61}|[a-z0-9\-]{1,30})\.[a-z]{2,}$/