From a20639bf21fcb8dbbd44629760a1e142bda3e387 Mon Sep 17 00:00:00 2001 From: Kieran Date: Mon, 13 Mar 2023 10:22:24 +0000 Subject: [PATCH 1/2] New translations en.json (Japanese) --- packages/app/src/translations/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/translations/ja.json b/packages/app/src/translations/ja.json index 9001036c..3c6e81e8 100644 --- a/packages/app/src/translations/ja.json +++ b/packages/app/src/translations/ja.json @@ -108,7 +108,7 @@ "Iwm6o2": "NIP-05ショップ", "JCIgkj": "ユーザー名", "JHEHCk": "ザップ ({n})", - "JXtsQW": "手軽なザップ寄付", + "JXtsQW": "ファストザップ寄付", "JkLHGw": "ウェブサイト", "K3r6DQ": "削除", "K7AkdL": "表示", -- 2.45.2 From 8e3addbc9138d070371f7bf74ce8d2db9f2b5d80 Mon Sep 17 00:00:00 2001 From: Kieran Date: Mon, 13 Mar 2023 14:44:56 +0000 Subject: [PATCH 2/2] chore: remove nostrplebs/nests --- packages/app/src/Const.ts | 5 ----- packages/app/src/Element/HyperText.tsx | 10 ---------- packages/app/src/Element/Nip05.css | 21 -------------------- packages/app/src/Element/NostrNestsEmbed.tsx | 5 ----- packages/app/src/Element/ProfilePreview.tsx | 4 ++-- packages/app/src/Pages/Verification.tsx | 7 ------- 6 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 packages/app/src/Element/NostrNestsEmbed.tsx diff --git a/packages/app/src/Const.ts b/packages/app/src/Const.ts index a8baf797..2caed4d3 100644 --- a/packages/app/src/Const.ts +++ b/packages/app/src/Const.ts @@ -155,11 +155,6 @@ export const TwitchRegex = /twitch.tv\/([a-z0-9_]+$)/i; export const AppleMusicRegex = /music\.apple\.com\/([a-z]{2}\/)?(?:album|playlist)\/[\w\d-]+\/([.a-zA-Z0-9-]+)(?:\?i=\d+)?/i; -/** - * Nostr Nests embed regex - */ -export const NostrNestsRegex = /nostrnests\.com\/[a-zA-Z0-9]+/i; - /* * Magnet link parser */ diff --git a/packages/app/src/Element/HyperText.tsx b/packages/app/src/Element/HyperText.tsx index 165fdaa2..b91e4cab 100644 --- a/packages/app/src/Element/HyperText.tsx +++ b/packages/app/src/Element/HyperText.tsx @@ -14,7 +14,6 @@ import { SpotifyRegex, TwitchRegex, AppleMusicRegex, - NostrNestsRegex, WavlakeRegex, } from "Const"; import { RootState } from "State/Store"; @@ -25,7 +24,6 @@ import TidalEmbed from "Element/TidalEmbed"; import { ProxyImg } from "Element/ProxyImg"; import TwitchEmbed from "Element/TwitchEmbed"; import AppleMusicEmbed from "Element/AppleMusicEmbed"; -import NostrNestsEmbed from "Element/NostrNestsEmbed"; import WavlakeEmbed from "Element/WavlakeEmbed"; export default function HyperText({ link, creator }: { link: string; creator: HexKey }) { @@ -71,7 +69,6 @@ export default function HyperText({ link, creator }: { link: string; creator: He const isSpotifyLink = SpotifyRegex.test(a); const isTwitchLink = TwitchRegex.test(a); const isAppleMusicLink = AppleMusicRegex.test(a); - const isNostrNestsLink = NostrNestsRegex.test(a); const isWavlakeLink = WavlakeRegex.test(a); const extension = FileExtensionRegex.test(url.pathname.toLowerCase()) && RegExp.$1; if (extension && !isAppleMusicLink) { @@ -140,13 +137,6 @@ export default function HyperText({ link, creator }: { link: string; creator: He return ; } else if (isAppleMusicLink) { return ; - } else if (isNostrNestsLink) { - return [ - e.stopPropagation()} target="_blank" rel="noreferrer" className="ext"> - {a} - , - , - ]; } else if (isWavlakeLink) { return ; } else { diff --git a/packages/app/src/Element/Nip05.css b/packages/app/src/Element/Nip05.css index bde71157..fa9e916a 100644 --- a/packages/app/src/Element/Nip05.css +++ b/packages/app/src/Element/Nip05.css @@ -22,27 +22,6 @@ background-image: var(--strike-army-gradient); } -.nip05 .domain[data-domain="nostrplebs.com"] { - color: var(--highlight); - background-color: var(--highlight); -} - -.nip05 .domain[data-domain="nostrpurple.com"] { - color: var(--highlight); - background-color: var(--highlight); -} - -.nip05 .domain[data-domain="nostr.fan"] { - color: var(--highlight); - background-color: var(--highlight); -} - -.nip05 .domain[data-domain="nostriches.net"] { - color: var(--highlight); - background-color: var(--highlight); - text-overflow: ellipsis; -} - .nip05 .badge { color: var(--highlight); margin-left: 0.2em; diff --git a/packages/app/src/Element/NostrNestsEmbed.tsx b/packages/app/src/Element/NostrNestsEmbed.tsx deleted file mode 100644 index 339b8022..00000000 --- a/packages/app/src/Element/NostrNestsEmbed.tsx +++ /dev/null @@ -1,5 +0,0 @@ -const NostrNestsEmbed = ({ link }: { link: string }) => ( - -); - -export default NostrNestsEmbed; diff --git a/packages/app/src/Element/ProfilePreview.tsx b/packages/app/src/Element/ProfilePreview.tsx index b7db72f3..157ca682 100644 --- a/packages/app/src/Element/ProfilePreview.tsx +++ b/packages/app/src/Element/ProfilePreview.tsx @@ -1,11 +1,11 @@ import "./ProfilePreview.css"; import { ReactNode } from "react"; +import { useInView } from "react-intersection-observer"; +import { HexKey } from "@snort/nostr"; import ProfileImage from "Element/ProfileImage"; import FollowButton from "Element/FollowButton"; import { useUserProfile } from "Hooks/useUserProfile"; -import { HexKey } from "@snort/nostr"; -import { useInView } from "react-intersection-observer"; export interface ProfilePreviewProps { pubkey: HexKey; diff --git a/packages/app/src/Pages/Verification.tsx b/packages/app/src/Pages/Verification.tsx index 25ebfd5b..e168ae1a 100644 --- a/packages/app/src/Pages/Verification.tsx +++ b/packages/app/src/Pages/Verification.tsx @@ -15,13 +15,6 @@ export const services = [ supportLink: "https://snort.social/help", about: , }, - { - name: "Nostr Plebs", - service: "https://nostrplebs.com/api/v1", - link: "https://nostrplebs.com/", - supportLink: "https://nostrplebs.com/manage", - about: , - }, ]; export default function VerificationPage() { -- 2.45.2