forked from cory/tildefriends
Channel messages, and show some more things based on refs.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4073 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
@ -359,6 +359,12 @@ class TfMessageElement extends LitElement {
|
||||
</div>
|
||||
<pre>${content.address.host}:${content.address.port}</pre>
|
||||
</span>`);
|
||||
} else if (content.type === 'channel') {
|
||||
return small_frame(html`
|
||||
<div>
|
||||
${content.subscribed ? 'subscribed to' : 'unsubscribed from'} <a href=${'#q=' + encodeURIComponent('#' + content.channel)}>#${content.channel}</a>
|
||||
</div>
|
||||
`);
|
||||
} else if (typeof(this.message.content) == 'string') {
|
||||
return small_frame(html`<span>🔒</span>`);
|
||||
} else {
|
||||
|
@ -23,9 +23,11 @@ class TfNewsElement extends LitElement {
|
||||
this.following = [];
|
||||
}
|
||||
|
||||
process_messages(messages, in_messages_by_id) {
|
||||
process_messages(messages) {
|
||||
let self = this;
|
||||
let messages_by_id = Object.assign({}, in_messages_by_id || {});
|
||||
let messages_by_id = {};
|
||||
|
||||
console.log('processing', messages.length, 'messages');
|
||||
|
||||
function ensure_message(id) {
|
||||
let found = messages_by_id[id];
|
||||
|
@ -72,7 +72,12 @@ class TfTabNewsFeedElement extends LitElement {
|
||||
JOIN messages_refs ON news.id = messages_refs.ref
|
||||
JOIN messages ON messages_refs.message = messages.id
|
||||
UNION
|
||||
SELECT * FROM news
|
||||
SELECT messages.*
|
||||
FROM news
|
||||
JOIN messages_refs ON news.id = messages_refs.message
|
||||
JOIN messages ON messages_refs.ref = messages.id
|
||||
UNION
|
||||
SELECT news.* FROM news
|
||||
`,
|
||||
[
|
||||
JSON.stringify(this.following),
|
||||
|
Reference in New Issue
Block a user