-
+
{options.showTime ?
{moment(ev.CreatedAt * 1000).fromNow()}
@@ -146,37 +88,7 @@ export default function Note(props) {
goToEvent(e, ev.Id)}>
{transformBody()}
- {options.showFooter ?
-
- {isMine ?
- deleteEvent()} />
- : null}
- {tipButton()}
- setReply(s => !s)}>
-
-
- {Object.keys(emojiReactions).map((emoji) => {
- return (
- react(emoji)}>
-
- {emoji}
-
-
- {emojiReactions[emoji]}
-
- )
- })}
- like()}>
-
- {likes}
-
- dislike()}>
-
- {dislikes}
-
-
: null}
-
setReply(false)} show={reply} />
- setTip(false)} show={tip} />
+ {options.showFooter ? : null}
)
}
\ No newline at end of file
diff --git a/src/element/NoteFooter.js b/src/element/NoteFooter.js
new file mode 100644
index 00000000..775d62b9
--- /dev/null
+++ b/src/element/NoteFooter.js
@@ -0,0 +1,98 @@
+import { useMemo, useState } from "react";
+import { useSelector } from "react-redux";
+import { faHeart, faReply, faThumbsDown, faTrash, faBolt } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import useEventPublisher from "../feed/EventPublisher";
+import { normalizeReaction, Reaction } from "../Util";
+import { NoteCreator } from "./NoteCreator";
+import LNURLTip from "./LNURLTip";
+
+export default function NoteFooter(props) {
+ const reactions = props.reactions;
+ const ev = props.ev;
+
+ const login = useSelector(s => s.login.publicKey);
+ const author = useSelector(s => s.users.users[ev.RootPubKey]);
+ const publisher = useEventPublisher();
+ const [reply, setReply] = useState(false);
+ const [tip, setTip] = useState(false);
+ const isMine = ev.RootPubKey === login;
+
+ const groupReactions = useMemo(() => {
+ return reactions?.reduce((acc, { content }) => {
+ let r = normalizeReaction(content ?? "");
+ const amount = acc[r] || 0
+ return { ...acc, [r]: amount + 1 }
+ }, {
+ [Reaction.Positive]: 0,
+ [Reaction.Negative]: 0
+ });
+ }, [reactions]);
+
+ function hasReacted(emoji) {
+ return reactions?.find(({ PubKey, Content }) => Content === emoji && PubKey === login)
+ }
+
+ async function react(content) {
+ let evLike = await publisher.react(ev, content);
+ publisher.broadcast(evLike);
+ }
+
+ async function deleteEvent() {
+ if (window.confirm(`Are you sure you want to delete ${ev.Id.substring(0, 8)}?`)) {
+ let evDelete = await publisher.delete(ev.Id);
+ publisher.broadcast(evDelete);
+ }
+ }
+
+ function tipButton() {
+ let service = author?.lud16 || author?.lud06;
+ if (service) {
+ return (
+ <>
+
setTip(true)}>
+
+
+
+ )
+ }
+ return null;
+ }
+
+ function reactionIcon(content) {
+ switch (content) {
+ case Reaction.Positive: {
+ return
;
+ }
+ case Reaction.Negative: {
+ return
;
+ }
+ }
+ return content;
+ }
+
+ return (
+ <>
+
+ {isMine ?
+ deleteEvent()} />
+ : null}
+ {tipButton()}
+ setReply(s => !s)}>
+
+
+ {Object.keys(groupReactions).map((emoji) => {
+ return (
+ react(emoji)} key={emoji}>
+ {reactionIcon(emoji)}
+ {groupReactions[emoji] ? <> {groupReactions[emoji]} : null}
+
+ )
+ })}
+
+
setReply(false)} show={reply} />
+ setTip(false)} show={tip} />
+
+ )
+}
\ No newline at end of file
diff --git a/src/feed/EventPublisher.js b/src/feed/EventPublisher.js
index a8c11dab..d4809b83 100644
--- a/src/feed/EventPublisher.js
+++ b/src/feed/EventPublisher.js
@@ -83,7 +83,7 @@ export default function useEventPublisher() {
}
return await signEvent(ev);
},
- like: async (evRef, content = "+") => {
+ react: async (evRef, content = "+") => {
let ev = Event.ForPubKey(pubKey);
ev.Kind = EventKind.Reaction;
ev.Content = content;
@@ -91,14 +91,6 @@ export default function useEventPublisher() {
ev.Tags.push(new Tag(["p", evRef.PubKey], 1));
return await signEvent(ev);
},
- dislike: async (evRef) => {
- let ev = Event.ForPubKey(pubKey);
- ev.Kind = EventKind.Reaction;
- ev.Content = "-";
- ev.Tags.push(new Tag(["e", evRef.Id], 0));
- ev.Tags.push(new Tag(["p", evRef.PubKey], 1));
- return await signEvent(ev);
- },
addFollow: async (pkAdd) => {
let ev = Event.ForPubKey(pubKey);
ev.Kind = EventKind.ContactList;
diff --git a/src/feed/LoginFeed.js b/src/feed/LoginFeed.js
index e085404d..cfa70019 100644
--- a/src/feed/LoginFeed.js
+++ b/src/feed/LoginFeed.js
@@ -24,7 +24,6 @@ export default function useLoginFeed() {
sub.Authors.add(pubKey);
sub.Kinds.add(EventKind.ContactList);
sub.Kinds.add(EventKind.SetMetadata);
- sub.Kinds.add(EventKind.Deletion);
let notifications = new Subscriptions();
notifications.Kinds.add(EventKind.TextNote);
diff --git a/src/feed/ThreadFeed.js b/src/feed/ThreadFeed.js
index d8a65985..62643453 100644
--- a/src/feed/ThreadFeed.js
+++ b/src/feed/ThreadFeed.js
@@ -13,6 +13,7 @@ export default function useThreadFeed(id) {
const subRelated = new Subscriptions();
subRelated.Kinds.add(EventKind.Reaction);
subRelated.Kinds.add(EventKind.TextNote);
+ subRelated.Kinds.add(EventKind.Deletion);
subRelated.ETags = thisSub.Ids;
thisSub.AddSubscription(subRelated);
@@ -38,6 +39,7 @@ export default function useThreadFeed(id) {
let relatedSubs = new Subscriptions();
relatedSubs.Kinds.add(EventKind.Reaction);
relatedSubs.Kinds.add(EventKind.TextNote);
+ relatedSubs.Kinds.add(EventKind.Deletion);
relatedSubs.ETags = otherSubs.Ids;
otherSubs.AddSubscription(relatedSubs);
diff --git a/src/nostr/Event.js b/src/nostr/Event.js
index dcad2503..058b462e 100644
--- a/src/nostr/Event.js
+++ b/src/nostr/Event.js
@@ -59,16 +59,27 @@ export default class Event {
this.Thread = null;
}
+ /**
+ * Get the pub key of the creator of this event NIP-26
+ */
+ get RootPubKey() {
+ let delegation = this.Tags.find(a => a.Key === "delegation");
+ if (delegation) {
+ return delegation.PubKey;
+ }
+ return this.PubKey;
+ }
+
/**
* Sign this message with a private key
* @param {string} key Key to sign message with
*/
async Sign(key) {
this.Id = await this.CreateId();
-
+
let sig = await secp.schnorr.sign(this.Id, key);
this.Signature = secp.utils.bytesToHex(sig);
- if(!await this.Verify()) {
+ if (!await this.Verify()) {
throw "Signing failed";
}
}
@@ -96,13 +107,13 @@ export default class Event {
let payloadData = new TextEncoder().encode(JSON.stringify(payload));
let data = await secp.utils.sha256(payloadData);
let hash = secp.utils.bytesToHex(data);
- if(this.Id !== null && hash !== this.Id) {
+ if (this.Id !== null && hash !== this.Id) {
console.debug(payload);
throw "ID doesnt match!";
}
return hash;
}
-
+
/**
* Does this event have content
* @returns {boolean}
@@ -115,7 +126,7 @@ export default class Event {
}
static FromObject(obj) {
- if(typeof obj !== "object") {
+ if (typeof obj !== "object") {
return null;
}
@@ -138,7 +149,7 @@ export default class Event {
pubkey: this.PubKey,
created_at: this.CreatedAt,
kind: this.Kind,
- tags: this.Tags.sort((a,b) => a.Index - b.Index).map(a => a.ToObject()).filter(a => a !== null),
+ tags: this.Tags.sort((a, b) => a.Index - b.Index).map(a => a.ToObject()).filter(a => a !== null),
content: this.Content,
sig: this.Signature
};
diff --git a/src/nostr/Tag.js b/src/nostr/Tag.js
index 84e885b8..0569c86c 100644
--- a/src/nostr/Tag.js
+++ b/src/nostr/Tag.js
@@ -28,6 +28,10 @@ export default class Tag {
}
break;
}
+ case "delegation": {
+ this.PubKey = tag[1];
+ break;
+ }
default: {
this.Other = tag;
break;