Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CSP/Ref fix

Browse Source
This commit is contained in:
Kieran 2022-12-28 20:27:25 +00:00
parent 675f5eefa0
commit b26f3a9b95
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
3 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
public/index.html
View File

@ -1,20 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Fast nostr web ui"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/nostrich_512.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>snort.social - Nostr interface</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
</html>
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Fast nostr web ui" />
<meta http-equiv="Content-Security-Policy"
content="default-src 'self'; child-src 'none'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src wss://* 'self'; img-src *; font-src https://fonts.gstatic.com;" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/nostrich_512.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>snort.social - Nostr interface</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
</html>

31
src/element/Note.js
View File

@ -54,8 +54,6 @@ export default function Note(props) {
function transformBody() {
let body = ev.Content;
let pTags = ev.Tags.filter(a => a.Key === "p");
let urlBody = body.split(UrlRegex);
return urlBody.map(a => {
@ -84,15 +82,23 @@ export default function Note(props) {
}
} else {
let mentions = a.split(MentionRegex).map((match) => {
if (match.startsWith("#")) {
let idx = parseInt(match.match(/\[(\d+)\]/)[1]);
let pref = pTags[idx];
if (pref) {
let pUser = users[pref.PubKey]?.name ?? pref.PubKey.substring(0, 8);
return <Link key={pref.PubKey} to={`/p/${pref.PubKey}`}>#{pUser}</Link>;
} else {
return <pre>BROKEN REF: {match[0]}</pre>;
}
let matchTag = match.match(/#\[(\d+)\]/);
if (matchTag && matchTag.length === 2) {
let idx = parseInt(matchTag[1]);
let ref = ev.Tags.find(a => a.Index === idx);
if (ref) {
switch(ref.Key) {
case "p": {
let pUser = users[ref.PubKey]?.name ?? ref.PubKey.substring(0, 8);
return <Link key={ref.PubKey} to={`/p/${ref.PubKey}`}>@{pUser}</Link>;
}
case "e": {
let eText = ref.Event.substring(0, 8);
return <Link key={ref.Event} to={`/e/${ref.Event}`}>#{eText}</Link>;
}
}
}
return <b style={{color: "red"}}>{matchTag[0]}?</b>;
} else {
return match;
}
@ -128,6 +134,9 @@ export default function Note(props) {
<span className="pill">
👍 {(reactions?.length ?? 0)}
</span>
<span className="pill" onClick={() => console.debug(ev)}>
<i>i</i>
</span>
</div>
</div>
)

2
src/index.css
View File

@ -72,7 +72,7 @@ span.pill {
padding: 0 10px;
border-radius: 10px;
user-select: none;
margin: 2px 10px;
margin: 2px 5px;
}
span.pill:hover {