skorotkiewicz/yosup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for DMs being broken

Browse source
This commit is contained in:
Thomas Mathews 2023-03-23 19:19:15 -07:00
parent 6c9f5f12fe
commit 8bbc6c75d5
5 changed files with 89 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

15
js/main.js
View file

@ -184,7 +184,7 @@ function on_pool_open(relay) {
const { pubkey } = model;
// Get all our info & history, well close this after we get it
fetch_profile(pubkey, model.pool, relay);
fetch_profile_info(pubkey, model.pool, relay);
// Get our notifications
relay.subscribe(SID_NOTIFICATIONS, [{
@ -225,23 +225,20 @@ async function on_pool_eose(relay, sub_id) {
break
case SID_FRIENDS:
view_timeline_refresh(model);
//pool.unsubscribe(sub_id, relay);
break
case SID_META:
// if sid is ours and we did not init properly (must be login) then
// we will fetch our friends history now
//if (model.pubkey == identifier &&
// !model_get_relay_que(model, relay).contacts_init) {
if (model.pubkey == identifier) {
fetch_friends_history(Array.from(model.contacts.friends),
pool, relay);
friends = Array.from(model.contacts.friends);
friends.push(identifier);
fetch_friends_history(friends, pool, relay);
log_debug("Got our friends after no init & fetching our friends");
}
case SID_NOTIFICATIONS:
case SID_PROFILES:
pool.unsubscribe(sub_id, relay);
break;
case SID_DMS_OUT:
case SID_DMS_IN:
pool.unsubscribe(sub_id, relay);
break;
}
}

1
js/model.js
View file

@ -33,6 +33,7 @@ function model_process_event(model, relay, ev) {
fn = model_process_event_reaction;
break;
case KIND_DM:
fetch_profile = true;
fn = model_process_event_dm;
break;
}

43
js/ui/state.js
View file

@ -119,10 +119,12 @@ function view_timeline_apply_mode(model, mode, opts={}, push_state=true) {
view_update_navs(mode);
find_node("#view [role='profile-info']").classList.toggle("hide", mode != VM_USER);
const timeline_el = find_node("#timeline");
timeline_el.classList.toggle("reverse", mode == VM_THREAD);
timeline_el.classList.toggle("reverse", mode == VM_THREAD || mode == VM_DM_THREAD);
timeline_el.classList.toggle("hide", mode == VM_SETTINGS || mode == VM_DM);
find_node("#settings").classList.toggle("hide", mode != VM_SETTINGS);
find_node("#dms").classList.toggle("hide", mode != VM_DM);
find_node("#dm-post").classList.toggle("hide", mode != VM_DM_THREAD);
find_node("#new-note-mobile").classList.toggle("hide", mode == VM_DM_THREAD);
find_node("#header-tools button[action='mark-all-read']")
.classList.toggle("hide", mode != VM_DM);
@ -595,12 +597,15 @@ function init_my_pfp(model) {
function init_postbox(model) {
find_node("#reply-content").addEventListener("input", oninput_post);
find_node("#dm-post textarea").addEventListener("input", oninput_post);
find_node("button[name='reply']")
.addEventListener("click", onclick_reply);
find_node("button[name='reply-all']")
.addEventListener("click", onclick_reply);
find_node("button[name='send']")
.addEventListener("click", onclick_send);
find_node("button[name='send-dm']")
.addEventListener("click", onclick_send_dm);
}
async function onclick_reply(ev) {
do_send_reply(ev.target.dataset.all == "1");
@ -622,26 +627,33 @@ async function onclick_send(ev) {
// Reset UI
el_input.value = "";
trigger_postbox_assess(el_input);
trigger_postbox_assess(el_input);
close_modal(el);
/*
const el_cw = document.querySelector("#content-warning-input");
//tags: el_cw.value ? [["content-warning", el_cw.value]] : [],
// Handle DM type post
if (mode == VM_DM_THREAD) {
if (!dms_available()) {
window.alert("DMing not available.");
return;
}
post.kind = KIND_DM;
const target = el.dataset.pubkey;
post.tags.splice(0, 0, ["p", target]);
post.content = await window.nostr.nip04.encrypt(target, post.content);
}
el_cw.value = "";*/
}
async function onclick_send_dm(ev) {
const pubkey = await get_pubkey();
const el = find_node("#dm-post");
const el_input = el.querySelector("textarea");
const target = view_get_timeline_el().dataset.pubkey;
let post = {
pubkey,
kind: KIND_DM,
created_at: new_creation_time(),
content: await window.nostr.nip04.encrypt(target, el_input.value),
tags: [["p", target]],
};
post.id = await nostrjs.calculate_id(post);
post = await sign_event(post);
broadcast_event(post);
el_input.value = "";
trigger_postbox_assess(el_input);
}
/* oninput_post checks the content of the textarea and updates the size
* of it's element. Additionally I will toggle the enabled state of the sending
* button.
@ -738,6 +750,7 @@ function onclick_any(ev) {
break;
case "new-note":
new_note();
break;
}
}