mleku/smesh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: normalize user's website urls

Browse Source
This commit is contained in:
codytseng
2025-02-06 15:28:06 +08:00
parent 372e7a9976
commit 9af2121efe
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/event.ts
View File

@@ -2,9 +2,9 @@ import { BIG_RELAY_URLS, COMMENT_EVENT_KIND, PICTURE_EVENT_KIND } from '@/consta
import client from '@/services/client.service' import client from '@/services/client.service'
import { TImageInfo, TRelayList } from '@/types' import { TImageInfo, TRelayList } from '@/types'
import { Event, kinds, nip19 } from 'nostr-tools' import { Event, kinds, nip19 } from 'nostr-tools'
import { extractImageInfoFromTag, isReplyETag, isRootETag, tagNameEquals } from './tag'
import { isWebsocketUrl, normalizeUrl } from './url'
import { formatPubkey } from './pubkey' import { formatPubkey } from './pubkey'
import { extractImageInfoFromTag, isReplyETag, isRootETag, tagNameEquals } from './tag'
import { isWebsocketUrl, normalizeHttpUrl, normalizeUrl } from './url'
export function isNsfwEvent(event: Event) { export function isNsfwEvent(event: Event) {
return event.tags.some( return event.tags.some(
@@ -123,7 +123,7 @@ export function getProfileFromProfileEvent(event: Event) {
original_username: username, original_username: username,
nip05: profileObj.nip05, nip05: profileObj.nip05,
about: profileObj.about, about: profileObj.about,
website: profileObj.website, website: profileObj.website ? normalizeHttpUrl(profileObj.website) : undefined,
created_at: event.created_at created_at: event.created_at
} }
} catch (err) { } catch (err) {

12
src/lib/url.ts
View File

@@ -15,6 +15,18 @@ export function normalizeUrl(url: string): string {
return p.toString() return p.toString()
} }
export function normalizeHttpUrl(url: string): string {
if (url.indexOf('://') === -1) url = 'https://' + url
const p = new URL(url)
p.pathname = p.pathname.replace(/\/+/g, '/')
if (p.pathname.endsWith('/')) p.pathname = p.pathname.slice(0, -1)
if ((p.port === '80' && p.protocol === 'http:') || (p.port === '443' && p.protocol === 'https:'))
p.port = ''
p.searchParams.sort()
p.hash = ''
return p.toString()
}
export function simplifyUrl(url: string): string { export function simplifyUrl(url: string): string {
return url.replace('wss://', '').replace('ws://', '').replace(/\/$/, '') return url.replace('wss://', '').replace('ws://', '').replace(/\/$/, '')
} }