nostr
/
nostrweb
3
1
Fork 1
Code Issues 24 Pull Requests 3 Projects 1 Releases 27 Activity

refactoring: eleanup part I 

Styled profile image to be aligned at the top together with the
event metadata and content.

Still need to decide on which relays to enable.

JavaScript lint fixes.
pull/2/head
OFF0 2022-11-14 08:15:20 +01:00
parent b2ad1d4c60
commit a2a5cfa341
Signed by: offbyn
GPG Key ID: 94A2F643C51F37FA
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cards.css
View File

@ -12,10 +12,11 @@
}
.mbox .mbox-img {
align-self: center;
align-self: start;
flex-basis: 4ch;
height: 4ch;
margin-right: 1rem;
margin-top: .5ch;
max-width: 4ch;
}

36
src/main.js
View File

@ -3,7 +3,7 @@ import {elem} from './domutil.js';
// curl -H 'accept: application/nostr+json' https://nostr.x1ddos.ch
const pool = relayPool();
pool.addRelay('wss://nostr.x1ddos.ch', {read: true, write: true});
// pool.addRelay('wss://nostr.bitcoiner.social/', {read: true, write: true});
pool.addRelay('wss://nostr.bitcoiner.social/', {read: true, write: true});
// pool.addRelay('wss://nostr.openchain.fr', {read: true, write: true});
// pool.addRelay('wss://relay.nostr.info', {read: true, write: true});
// pool.addRelay('wss://relay.damus.io', {read: true, write: true});
@ -35,7 +35,7 @@ function onEvent(evt, relay) {
updateContactList(evt, relay);
break;
default:
// console.log(`TODO: add support for event kind ${evt.kind}`, evt)
console.log(`TODO: add support for event kind ${evt.kind}`, evt)
}
}
@ -67,7 +67,7 @@ function handleTextNote(evt, relay) {
} else {
eventRelayMap[evt.id] = [relay];
(evt.tags.some(hasEventTag) ? replyList : textNoteList).push(evt);
renderFeed()
renderFeed();
}
}
@ -76,18 +76,18 @@ const feedContainer = document.querySelector('#feed');
const feedDomMap = {};
const sortByCreatedAt = (evt1, evt2) => {
if (evt1.created_at === evt2.created_at) {
//console.log('OMG exactly at the same time', evt1, evt2);
// console.log('TODO: OMG exactly at the same time, figure out how to sort then', evt1, evt2);
}
return evt1.created_at > evt2.created_at ? -1 : 1;
};
let debounceDebugMessageTimer;
// let debounceDebugMessageTimer;
function renderFeed() {
const sortedFeeds = textNoteList.sort(sortByCreatedAt).reverse();
clearTimeout(debounceDebugMessageTimer);
debounceDebugMessageTimer = setTimeout(() => {
console.log(`${sortedFeeds.map(e => dateTime.format(e.created_at * 1000)).join('\n')}`)
}, 2000);
// clearTimeout(debounceDebugMessageTimer);
// debounceDebugMessageTimer = setTimeout(() => {
// console.log(`${sortedFeeds.map(e => dateTime.format(e.created_at * 1000)).join('\n')}`)
// }, 2000);
sortedFeeds.forEach((textNoteEvent, i) => {
if (feedDomMap[textNoteEvent.id]) {
// TODO check eventRelayMap if event was published to different relays
@ -99,13 +99,6 @@ function renderFeed() {
feedContainer.append(art);
} else {
feedDomMap[sortedFeeds[i - 1].id].before(art);
console.log(
dateTime.format(sortedFeeds[i - 1].created_at * 1000),
' > ',
dateTime.format(textNoteEvent.created_at * 1000),
)
// feedContainer.insertBefore(art, feedDomMap[sortedFeeds[i - 1].id]);
//feedDomMap[sortedFeeds[i - 1].id].after(art);
}
});
}
@ -133,7 +126,6 @@ function handleRecommendServer(evt, relay) {
}
const art = renderRecommendServer(evt, relay);
if (textNoteList.length < 2) {
console.log('prob does happen often')
feedContainer.append(art);
return;
}
@ -152,7 +144,7 @@ function renderRecommendServer(evt, relay) {
const [host, img, time, userName] = getMetadata(evt, relay);
const body = elem('div', {className: 'mbox-body', title: dateTime.format(time)}, [
renderProfile(userName, host),
`recommends server: ${evt.content}`
`recommends server: ${evt.content}`,
]);
return rendernArticle([img, body], {className: 'mbox-recommend-server'});
}
@ -208,7 +200,7 @@ function setMetadata(evt, relay, 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 userImg = /*user?.metadata[relay]?.picture || */'bubble.svg'; // TODO: 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', {
@ -274,9 +266,7 @@ publish.addEventListener('click', async () => {
});
const input = document.querySelector('input[name="message"]');
input.addEventListener('input', () => {
publish.disabled = !input.value;
});
input.addEventListener('input', () => publish.disabled = !input.value);
// settings
const form = document.querySelector('form[name="settings"]');
@ -285,7 +275,7 @@ const pubKeyInput = form.querySelector('#pubkey');
const statusMessage = form.querySelector('#keystatus');
const generateBtn = form.querySelector('button[name="generate"]');
const importBtn = form.querySelector('button[name="import"]');
const privateTgl = form.querySelector('button[name="privatekey-toggle"]')
const privateTgl = form.querySelector('button[name="privatekey-toggle"]');
generateBtn.addEventListener('click', () => {
const privatekey = generatePrivateKey();