feature/refactor: smartfeeds to reduce the client complexity
This commit is contained in:
parent
46090d944a
commit
f6cd05beac
19 changed files with 782 additions and 800 deletions
|
|
@ -73,6 +73,10 @@
|
|||
border-radius: var(--border-radius);
|
||||
}
|
||||
|
||||
#chat .message-container .html-from-markdown {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#chat .message-container.user-tick.time-tick + .message-container.user-tick.time-tick,
|
||||
#chat .message-container.user-tick.time-tock + .message-container.user-tick.time-tock,
|
||||
#chat .message-container.user-tock.time-tick + .message-container.user-tock.time-tick,
|
||||
|
|
|
|||
|
|
@ -1,175 +1,3 @@
|
|||
<script>
|
||||
const time_tick_tock_timeout = 60 * 1000; // 1 minute
|
||||
let last_event_datetime_value = 0;
|
||||
let time_tick_tock_class = "time-tock";
|
||||
|
||||
let last_creator_id = null;
|
||||
let user_tick_tock_class = "user-tock";
|
||||
async function render_chat_event(event, position = "beforeend") {
|
||||
const creator = await USERS.get(event.creator_id);
|
||||
|
||||
const existing_element =
|
||||
document.getElementById(event.id) ??
|
||||
document.getElementById(event.meta?.temp_id ?? "") ??
|
||||
document.querySelector(`[data-temp_id="${event.meta?.temp_id ?? ""}" ]`);
|
||||
|
||||
const event_datetime = datetime_to_local(event.timestamps.created);
|
||||
|
||||
if (event_datetime.value - last_event_datetime_value > time_tick_tock_timeout) {
|
||||
time_tick_tock_class = time_tick_tock_class === "time-tick" ? "time-tock" : "time-tick";
|
||||
}
|
||||
last_event_datetime_value = event_datetime.value;
|
||||
|
||||
if (last_creator_id !== creator.id) {
|
||||
user_tick_tock_class = user_tick_tock_class === "user-tick" ? "user-tock" : "user-tick";
|
||||
last_creator_id = creator.id;
|
||||
}
|
||||
|
||||
const html_content = `<div id="${event.id}" class="message-container ${user_tick_tock_class} ${time_tick_tock_class}" data-creator_id="${creator.id}" data-temp_id="${event.meta?.temp_id ?? ""}">
|
||||
<div class="message-actions-container">
|
||||
<input
|
||||
type="checkbox"
|
||||
id="show_message_actions-${event.id}"
|
||||
class="message-actions-display-toggle"
|
||||
/>
|
||||
<label class="message-actions-display-toggle-label" for="show_message_actions-${event.id}">
|
||||
<div class="icon more-borderless"></div>
|
||||
</label>
|
||||
|
||||
<button class="message-action mockup" data-action="react"><i class="icon circle"></i><span class="action-name">React</span></button>
|
||||
<button class="message-action" data-action="reply" onclick="document.getElementById( 'parent-id' ).value = '${event.id}';"><i class="icon reply"></i><span class="action-name">Reply</span></button>
|
||||
<button class="message-action mockup" data-action="forward_copy"><i class="icon forward-copy"></i><span class="action-name">Copy Link</span></button>
|
||||
<button class="message-action mockup" data-action="delete"><i class="icon trash"></i><span class="action-name">Delete</span></button>
|
||||
</div>
|
||||
<div class="info-container">
|
||||
<div class="avatar-container">
|
||||
<img src="${creator.meta?.avatar ?? "/images/default_avatar.gif"}" alt="user avatar" />
|
||||
</div>
|
||||
<div class="username-container">
|
||||
<span class="username">${creator.username ?? "unknown"}</span>
|
||||
</div>
|
||||
<div class="datetime-container">
|
||||
<span class="long">${event_datetime.long}</span>
|
||||
<span class="short">${event_datetime.short}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="message-content-container">${htmlify(event.data.content)}</div>
|
||||
<div class="message-media-container">${htmlify(event.data.media?.join("\n") ?? "")}</div>
|
||||
</div>`;
|
||||
|
||||
if (existing_element) {
|
||||
const template = document.createElement("template");
|
||||
template.innerHTML = html_content;
|
||||
existing_element.replaceWith(template.content.firstChild);
|
||||
} else {
|
||||
// TODO: threading
|
||||
document.getElementById("chat-content")?.insertAdjacentHTML(position, html_content);
|
||||
}
|
||||
}
|
||||
|
||||
async function handle_chat_events(events) {
|
||||
if (!Array.isArray(events)) {
|
||||
debugger;
|
||||
console.warn("got unexpected value for handle_chat_events `events` argument.");
|
||||
return;
|
||||
}
|
||||
|
||||
const topic_chat_content = document.getElementById("chat-content");
|
||||
|
||||
const sorted = events.sort((lhs, rhs) => lhs.id.localeCompare(rhs.id));
|
||||
for await (const event of sorted) {
|
||||
await render_chat_event(event);
|
||||
}
|
||||
|
||||
const last_message_id = sorted.reduce((_last_message_id, event) => {
|
||||
return event.id > _last_message_id && event.id.indexOf("TEMP") < 0
|
||||
? event.id
|
||||
: _last_message_id;
|
||||
}, topic_chat_content.dataset.last_message_id ?? "");
|
||||
|
||||
// if the last blurb has been updated, update the content's dataset to reflect that
|
||||
if (last_message_id !== topic_chat_content.dataset.last_message_id) {
|
||||
topic_chat_content.dataset.last_message_id = last_message_id;
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
topic_chat_content.scrollTop = topic_chat_content.scrollHeight;
|
||||
}, 50);
|
||||
}
|
||||
|
||||
// TODO: we need some abortcontroller handling here or something
|
||||
// similar for when we change topics, this is the most basic
|
||||
// first pass outline
|
||||
let topic_polling_request_abort_controller = null;
|
||||
async function poll_for_new_chat_events() {
|
||||
const topic_chat_content = document.getElementById("chat-content");
|
||||
const topic_id = document.body.dataset.topic;
|
||||
const last_message_id = topic_chat_content.dataset.last_message_id;
|
||||
|
||||
if (!topic_id) {
|
||||
return;
|
||||
}
|
||||
|
||||
const message_polling_url = `/api/topics/${topic_id}/events?type=chat&limit=100&sort=newest&wait=true${last_message_id ? `&after_id=${last_message_id}` : ""}`;
|
||||
|
||||
topic_polling_request_abort_controller =
|
||||
topic_polling_request_abort_controller || new AbortController();
|
||||
|
||||
api.fetch(message_polling_url, {
|
||||
signal: topic_polling_request_abort_controller.signal,
|
||||
})
|
||||
.then(async (new_events_response) => {
|
||||
const new_events = await new_events_response.json();
|
||||
handle_chat_events(new_events);
|
||||
poll_for_new_chat_events(topic_id);
|
||||
})
|
||||
.catch((error) => {
|
||||
// TODO: poll again? back off?
|
||||
console.error(error);
|
||||
});
|
||||
}
|
||||
|
||||
async function load_active_topic_for_chat(event) {
|
||||
const topic_id = event?.detail?.topic_id ?? document.body.dataset.topic;
|
||||
if (!topic_id) return;
|
||||
|
||||
const topic_chat_content = document.getElementById("chat-content");
|
||||
topic_chat_content.innerHTML = "";
|
||||
|
||||
const user = document.body.dataset.user ? JSON.parse(document.body.dataset.user) : null;
|
||||
if (!user) return;
|
||||
|
||||
if (topic_polling_request_abort_controller) {
|
||||
topic_polling_request_abort_controller.abort();
|
||||
topic_polling_request_abort_controller = null;
|
||||
delete topic_chat_content.dataset.last_message_id;
|
||||
}
|
||||
|
||||
const topic_response = await api.fetch(`/api/topics/${topic_id}`);
|
||||
if (!topic_response.ok) {
|
||||
const error = await topic_response.json();
|
||||
alert(error.message ?? JSON.stringify(error));
|
||||
return;
|
||||
}
|
||||
|
||||
const topic = await topic_response.json();
|
||||
|
||||
const events_response = await api.fetch(
|
||||
`/api/topics/${topic_id}/events?type=chat&limit=100&sort=newest`,
|
||||
);
|
||||
if (!events_response.ok) {
|
||||
const error = await events_response.json();
|
||||
alert(error.message ?? JSON.stringify(error));
|
||||
return;
|
||||
}
|
||||
|
||||
const events = await events_response.json();
|
||||
handle_chat_events(events);
|
||||
poll_for_new_chat_events();
|
||||
}
|
||||
document.addEventListener("topic_changed", load_active_topic_for_chat);
|
||||
document.addEventListener("user_logged_in", load_active_topic_for_chat);
|
||||
</script>
|
||||
<div id="chat" class="tab">
|
||||
<input
|
||||
type="radio"
|
||||
|
|
@ -190,7 +18,131 @@
|
|||
<script src="/js/external/punycode.js" type="text/javascript"></script>
|
||||
|
||||
<div id="chat-container">
|
||||
<div id="chat-content"></div>
|
||||
<div
|
||||
id="chat-content"
|
||||
data-feed
|
||||
data-precheck="!!document.body.dataset.user && document.body.dataset.user.indexOf( 'topics.chat.read' ) !== -1"
|
||||
data-source="/api/topics/${ document.body.dataset.topic }/events?type=chat&limit=100&sort=newest&wait=true&after_id=${ feed.__newest_id ?? 'chat:able-able-able-able-able-able-able-able-able-able' }"
|
||||
data-longpolling="true"
|
||||
data-reverse="true"
|
||||
data-insert="append"
|
||||
data-autoscroll="true"
|
||||
>
|
||||
<script>
|
||||
{
|
||||
const feed = document.currentScript.closest("[data-feed]");
|
||||
|
||||
document.addEventListener("topic_changed", () => {
|
||||
feed.__reset && feed.__reset();
|
||||
});
|
||||
document.addEventListener("user_logged_in", () => {
|
||||
feed.__reset && feed.__reset();
|
||||
});
|
||||
|
||||
const time_tick_tock_timeout = 60_000;
|
||||
|
||||
let last_event_datetime_value = 0;
|
||||
let time_tick_tock_class = "time-tock";
|
||||
|
||||
let last_creator_id = "";
|
||||
let user_tick_tock_class = "user-tock";
|
||||
|
||||
feed.__context = async (item) => {
|
||||
const event_datetime = datetime_to_local(item.timestamps.created);
|
||||
|
||||
if (
|
||||
event_datetime.value - last_event_datetime_value >
|
||||
time_tick_tock_timeout
|
||||
) {
|
||||
time_tick_tock_class =
|
||||
time_tick_tock_class === "time-tick"
|
||||
? "time-tock"
|
||||
: "time-tick";
|
||||
}
|
||||
last_event_datetime_value = event_datetime.value;
|
||||
|
||||
if (last_creator_id !== item.creator_id) {
|
||||
user_tick_tock_class =
|
||||
user_tick_tock_class === "user-tick"
|
||||
? "user-tock"
|
||||
: "user-tick";
|
||||
last_creator_id = item.creator_id;
|
||||
}
|
||||
|
||||
return {
|
||||
event: item,
|
||||
creator: await USERS.get(item.creator_id),
|
||||
event_datetime,
|
||||
time_tick_tock_class,
|
||||
user_tick_tock_class,
|
||||
};
|
||||
};
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<div
|
||||
id="${context.event.id}"
|
||||
class="message-container ${context.user_tick_tock_class} ${context.time_tick_tock_class}"
|
||||
data-creator_id="${context.creator.id}"
|
||||
data-temp_id="${context.event.meta?.temp_id ?? ''}"
|
||||
>
|
||||
<div class="message-actions-container">
|
||||
<input
|
||||
type="checkbox"
|
||||
id="show_message_actions-${context.event.id}"
|
||||
class="message-actions-display-toggle"
|
||||
/>
|
||||
<label
|
||||
class="message-actions-display-toggle-label"
|
||||
for="show_message_actions-${context.event.id}"
|
||||
>
|
||||
<div class="icon more-borderless"></div>
|
||||
</label>
|
||||
|
||||
<button class="message-action mockup" data-action="react">
|
||||
<i class="icon circle"></i><span class="action-name">React</span>
|
||||
</button>
|
||||
<button
|
||||
class="message-action"
|
||||
data-action="reply"
|
||||
onclick="document.getElementById( 'parent-id' ).value = '${context.event.id}';"
|
||||
>
|
||||
<i class="icon reply"></i><span class="action-name">Reply</span>
|
||||
</button>
|
||||
<button class="message-action mockup" data-action="forward_copy">
|
||||
<i class="icon forward-copy"></i
|
||||
><span class="action-name">Copy Link</span>
|
||||
</button>
|
||||
<button class="message-action mockup" data-action="delete">
|
||||
<i class="icon trash"></i><span class="action-name">Delete</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="info-container">
|
||||
<div class="avatar-container">
|
||||
<img
|
||||
src="${context.creator.meta?.avatar ?? '/images/default_avatar.gif'}"
|
||||
alt="user avatar"
|
||||
/>
|
||||
</div>
|
||||
<div class="username-container">
|
||||
<span class="username"
|
||||
>${context.creator.username ?? 'unknown'}</span
|
||||
>
|
||||
</div>
|
||||
<div class="datetime-container">
|
||||
<span class="long">${context.event_datetime.long}</span>
|
||||
<span class="short">${context.event_datetime.short}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="message-content-container">
|
||||
${htmlify(md_to_html(context.event.data.content))}
|
||||
</div>
|
||||
<div class="message-media-container">
|
||||
${htmlify(context.event.data.media?.join("\n") ?? "")}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div id="chat-entry-container">
|
||||
<form
|
||||
id="chat-entry"
|
||||
|
|
@ -203,23 +155,12 @@
|
|||
width: 100%;
|
||||
transition: all 0.5s;
|
||||
"
|
||||
on_reply="async (event) => { await render_chat_event(event); document.getElementById(event.id)?.classList.remove('sending'); document.getElementById( 'chat-input' ).value = ''; document.getElementById( 'chat-input' ).focus(); }"
|
||||
on_parsed="async (event) => { await render_chat_event(event); document.getElementById(event.id)?.classList.add('sending'); }"
|
||||
on_reply="async (event) => { await document.getElementById( 'chat-content' ).__render(event); document.getElementById(event.id)?.classList.remove('sending'); }"
|
||||
on_parsed="async (event) => { await document.getElementById( 'chat-content' ).__render(event); document.getElementById(event.id)?.classList.add('sending'); }"
|
||||
>
|
||||
<script>
|
||||
{
|
||||
const form = document.currentScript.closest("form");
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
const chat_input = form.querySelector(
|
||||
'textarea[name="data.content"]',
|
||||
);
|
||||
chat_input.addEventListener("keypress", (event) => {
|
||||
if (event.key === "Enter" && !event.shiftKey) {
|
||||
form.requestSubmit();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
document.addEventListener(
|
||||
"topic_changed",
|
||||
({ detail: { topic_id } }) => {
|
||||
|
|
@ -283,6 +224,8 @@
|
|||
rows="1"
|
||||
name="data.content"
|
||||
reset-on-submit
|
||||
focus-on-submit
|
||||
enter-key-submits
|
||||
></textarea>
|
||||
|
||||
<button id="chat-send" class="primary" aria-label="Send a message">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue