diff --git a/packages/content/src/index.ts b/packages/content/src/index.ts index 402e528..6ccf2b4 100644 --- a/packages/content/src/index.ts +++ b/packages/content/src/index.ts @@ -235,8 +235,7 @@ export const parseInvoice = (text: string, context: ParseContext): ParsedInvoice export const parseLink = (text: string, context: ParseContext): ParsedLink | void => { const prev = last(context.results) - const [link] = - text.match(/^([a-z\+:]{2,30}:\/\/)?[-\.~\w]+\.[\w]{2,6}([^\s]*[^<>"'\.!,:\s\)\(]+)?/gi) || [] + let link = text.match(/^([a-z\+:]{2,30}:\/\/)?[-\.~\w]+\.[\w]{2,6}([^\s]*[^<>"'\.!,:\s\)\(]+)?/gi)?.[0] // Skip url if it's just the end of a filepath or an ellipse if (!link || (prev?.type === ParsedType.Text && prev.value.endsWith("/")) || link.match(/\.\./)) { diff --git a/packages/util/package.json b/packages/util/package.json index 8b927a5..1ecd8ac 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "@welshman/util", - "version": "0.2.0", + "version": "0.2.1", "author": "hodlbod", "license": "MIT", "description": "A collection of nostr-related utilities.", diff --git a/packages/util/src/Kinds.ts b/packages/util/src/Kinds.ts index 1473cd2..8b3af27 100644 --- a/packages/util/src/Kinds.ts +++ b/packages/util/src/Kinds.ts @@ -121,6 +121,7 @@ export const INBOX_RELAYS = 10050 export const FILE_SERVERS = 10096 export const LIGHTNING_PUB_RPC = 21000 export const CLIENT_AUTH = 22242 +export const BLOSSOM_AUTH = 24242 export const AUTH_JOIN = 28934 export const AUTH_INVITE = 28935 export const WALLET_INFO = 13194 diff --git a/packages/util/src/Tags.ts b/packages/util/src/Tags.ts index 3b57103..c4702ca 100644 --- a/packages/util/src/Tags.ts +++ b/packages/util/src/Tags.ts @@ -62,7 +62,7 @@ export const getCommentTags = (tags: string[][]) => { } export const getCommentTagValues = (tags: string[][]) => - mapVals(tags => tags.map(nth(1)), getCommentTags(tags)) + mapVals(tags => tags.filter(t => ['a', 'e'].includes(t[0].toLowerCase())).map(nth(1)), getCommentTags(tags)) export const getReplyTags = (tags: string[][]) => { const validTags = tags.filter(t => ["a", "e", "q"].includes(t[0])) diff --git a/tag.sh b/tag.sh new file mode 100755 index 0000000..b3334c1 --- /dev/null +++ b/tag.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +status=$(git status | grep "nothing to commit") + +if [[ -z "$status" ]]; then + echo "Can't tag with uncommitted changes" + exit 1 +fi + +for pkg in $(ls packages); do + version=$(sed -nr 's/ +"version": "(.+)",/\1/p' packages/$pkg/package.json) + + git tag "$pkg/$version" >/dev/null 2>&1 +done + +git push +git push --tags