refactor: just moving helper functions around

pull/2/head
OFF0 2 years ago
parent d5fa2f420b
commit d2a7f4a603
Signed by: offbyn
GPG Key ID: 94A2F643C51F37FA

@ -15,7 +15,6 @@ const dateTime = new Intl.DateTimeFormat(navigator.language, {
dateStyle: 'short', dateStyle: 'short',
timeStyle: 'short', timeStyle: 'short',
}); });
const userList = [];
let max = 0; let max = 0;
function onEvent(evt, relay) { function onEvent(evt, relay) {
@ -24,12 +23,7 @@ function onEvent(evt, relay) {
} }
switch (evt.kind) { switch (evt.kind) {
case 0: case 0:
try { handleMetadata(evt, relay);
const content = JSON.parse(evt.content);
setMetadata(userList, relay, evt, content);
} catch(err) {
console.error(err);
}
break; break;
case 1: case 1:
renderTextNote(evt, relay); renderTextNote(evt, relay);
@ -104,25 +98,20 @@ function rendernArticle(content, props) {
feedContainer.prepend(art); feedContainer.prepend(art);
} }
function getMetadata(evt, relay) { const userList = [];
const {host} = new URL(relay);
const user = userList.find(user => user.pubkey === evt.pubkey);
const userImg = /*user?.metadata[relay]?.picture || */'bubble.svg'; // enable pic once we have proxy
const userName = user?.metadata[relay]?.name || evt.pubkey.slice(0, 8);
const userAbout = user?.metadata[relay]?.about || '';
const img = elem('img', {
className: 'mbox-img',
src: userImg,
alt: `${userName}@${host}`,
title: userAbout},
'');
const time = new Date(evt.created_at * 1000);
return [host, img, time, userName];
}
const tempContactList = {}; const tempContactList = {};
function setMetadata(userList, relay, evt, content) { function handleMetadata(evt, relay) {
try {
const content = JSON.parse(evt.content);
setMetadata(evt, relay, content);
} catch(err) {
console.log(evt);
console.error(err);
}
}
function setMetadata(evt, relay, content) {
const user = userList.find(u => u.pubkey === evt.pubkey); const user = userList.find(u => u.pubkey === evt.pubkey);
if (!user) { if (!user) {
userList.push({ userList.push({
@ -146,6 +135,22 @@ function setMetadata(userList, relay, evt, content) {
} }
} }
function getMetadata(evt, relay) {
const {host} = new URL(relay);
const user = userList.find(user => user.pubkey === evt.pubkey);
const userImg = /*user?.metadata[relay]?.picture || */'bubble.svg'; // enable pic once we have proxy
const userName = user?.metadata[relay]?.name || evt.pubkey.slice(0, 8);
const userAbout = user?.metadata[relay]?.about || '';
const img = elem('img', {
className: 'mbox-img',
src: userImg,
alt: `${userName}@${host}`,
title: userAbout},
'');
const time = new Date(evt.created_at * 1000);
return [host, img, time, userName];
}
function updateContactList(evt, relay) { function updateContactList(evt, relay) {
const user = userList.find(u => u.pupkey === evt.pubkey); const user = userList.find(u => u.pupkey === evt.pubkey);
if (user) { if (user) {

Loading…
Cancel
Save