Fixed blocked users slipping through.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4143 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
2023-01-21 19:30:00 +00:00
parent 2420869e7f
commit adefa76dfd
3 changed files with 4 additions and 4 deletions

View File

@ -109,8 +109,9 @@ class TfElement extends LitElement {
for (let i = 0; i < ids.length; i++) {
let id = ids[i];
let contact = contacts[i];
let found = Object.keys(contact.following).filter(y => !contact.blocking[y]);
let deeper = depth > 1 ? await this.following_deep_internal(found, depth - 1, Object.assign({}, contact.blocking, blocking), last_row_id, following, max_row_id) : [];
let all_blocking = Object.assign({}, contact.blocking, blocking);
let found = Object.keys(contact.following).filter(y => !all_blocking[y]);
let deeper = depth > 1 ? await this.following_deep_internal(found, depth - 1, all_blocking, last_row_id, following, max_row_id) : [];
result[id] = [id, ...found, ...deeper];
}
return [...new Set(Object.values(result).flat())];

View File

@ -268,7 +268,6 @@ class TfComposeElement extends LitElement {
render() {
let self = this;
let result = html`
<div>${JSON.stringify(this.drafts)}</div>
<div style="display: flex; flex-direction: row; width: 100%">
<textarea id="edit" @input=${this.input} @change=${this.change} @paste=${this.paste} style="flex: 1 0 50%">${this.drafts[this.branch || '']}</textarea>
<div id="preview" style="flex: 1 0 50%"></div>