3wordchant
/
oasis
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add code style fixes

This commit is contained in:
Vincent Ahrend 2020-02-17 12:57:01 +01:00
parent 6977cc3ee3
commit 2e7bc4739b
3 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/style.css
View File

@ -411,7 +411,7 @@ section > footer > form > button.liked {
}
}
.post-aside {
.post-aside {
display: flex;
flex-wrap: wrap;
flex-direction: column;
@ -420,7 +420,7 @@ section > footer > form > button.liked {
margin: var(--whole) 0;
}
.post-aside section {
.post-aside section {
max-width: var(--peta);
margin: 0 0 var(--micro) 0;
}

16
src/models.js
View File

@ -903,14 +903,14 @@ module.exports = ({ cooler, isPublic }) => {
pull.map(([key]) => key),
pullParallelMap(async (key, cb) => {
try {
const msg = await post.get(key)
const msg = await post.get(key);
// Retrieve a preview of this post's comments / thread
const thread = await post.fromThread(key)
msg.thread = await transform(ssb, thread, myFeedId)
cb(null, msg)
const thread = await post.fromThread(key);
msg.thread = await transform(ssb, thread, myFeedId);
cb(null, msg);
} catch (e) {
cb(null, null)
cb(null, null);
}
}),
pull.filter(
@ -921,12 +921,12 @@ module.exports = ({ cooler, isPublic }) => {
followingFilter,
pull.collect((err, collectedMessages) => {
if (err) {
reject(err)
reject(err);
} else {
resolve(transform(ssb, collectedMessages, myFeedId))
resolve(transform(ssb, collectedMessages, myFeedId));
}
})
)
);
}
)
);

102
src/views/index.js
View File

@ -129,7 +129,7 @@ const postInAside = msg => {
key: encodeURIComponent(msg.key),
author: encodeURIComponent(msg.value.author),
parent: encodeURIComponent(msg.value.content.root)
}
};
const url = {
author: `/author/${encoded.author}`,
@ -140,45 +140,46 @@ const postInAside = msg => {
json: `/json/${encoded.key}`,
reply: `/reply/${encoded.key}`,
comment: `/comment/${encoded.key}`
}
};
const isPrivate = Boolean(msg.value.meta.private)
const isRoot = msg.value.content.root == null
const isFork = msg.value.meta.postType === "reply"
const hasContentWarning = typeof msg.value.content.contentWarning === "string"
const isPrivate = Boolean(msg.value.meta.private);
const isRoot = msg.value.content.root == null;
const isFork = msg.value.meta.postType === "reply";
const hasContentWarning =
typeof msg.value.content.contentWarning === "string";
const isThreadTarget = Boolean(
lodash.get(msg, "value.meta.thread.target", false)
)
);
// TODO: I think this is actually true for both replies and comments.
const isReply = Boolean(lodash.get(msg, "value.meta.thread.reply", false))
const isReply = Boolean(lodash.get(msg, "value.meta.thread.reply", false));
const timeAgo = msg.value.meta.timestamp.received.since.replace("~", "")
const timeAgo = msg.value.meta.timestamp.received.since.replace("~", "");
const markdownContent = markdown(
msg.value.content.text,
msg.value.content.mentions
)
);
const likeButton = msg.value.meta.voted
? { value: 0, class: "liked" }
: { value: 1, class: null }
: { value: 1, class: null };
const likeCount = msg.value.meta.votes.length
const likeCount = msg.value.meta.votes.length;
const messageClasses = []
const messageClasses = [];
if (isPrivate) {
messageClasses.push("private")
messageClasses.push("private");
}
if (isThreadTarget) {
messageClasses.push("thread-target")
messageClasses.push("thread-target");
}
if (isReply) {
// True for comments too, I think
messageClasses.push("reply")
messageClasses.push("reply");
}
const postOptions = {
@ -186,9 +187,9 @@ const postInAside = msg => {
comment: i18n.commentDescription({ parentUrl: url.parent }),
reply: i18n.replyDescription({ parentUrl: url.parent }),
mystery: i18n.mysteryDescription
}
};
const isMarkdownEmpty = md => md === "<p>undefined</p>\n"
const isMarkdownEmpty = md => md === "<p>undefined</p>\n";
const articleElement = isMarkdownEmpty(markdownContent)
? article(
{ class: "content" },
@ -197,11 +198,11 @@ const postInAside = msg => {
.value
})
)
: article({ class: "content", innerHTML: markdownContent })
: article({ class: "content", innerHTML: markdownContent });
const articleContent = hasContentWarning
? details(summary(msg.value.content.contentWarning), articleElement)
: articleElement
: articleElement;
return section(
{
@ -241,13 +242,13 @@ const postInAside = msg => {
isPrivate || isRoot || isFork ? null : a({ href: url.reply }, i18n.reply),
a({ href: url.json }, i18n.json)
)
)
}
);
};
/**
* Render a section containing a link that takes users to the context for a
* Render a section containing a link that takes users to the context for a
* thread preview.
*
*
* @param {Array} thread with SSB message objects
* @param {Boolean} isComment true if this is shown in the context of a comment
* instead of a post
@ -256,54 +257,57 @@ const continueThreadComponent = (thread, isComment) => {
const encoded = {
next: encodeURIComponent(thread[THREAD_PREVIEW_LENGTH + 1].key),
parent: encodeURIComponent(thread[0].key)
}
const left = thread.length - (THREAD_PREVIEW_LENGTH + 1)
let continueLink
};
const left = thread.length - (THREAD_PREVIEW_LENGTH + 1);
let continueLink;
if (isComment == false) {
continueLink = `/thread/${encoded.parent}#${encoded.next}`
continueLink = `/thread/${encoded.parent}#${encoded.next}`;
return a(
{ href: continueLink },
`continue reading ${left} more comment${left === 1 ? "" : "s"}`
)
);
} else {
continueLink = `/thread/${encoded.parent}`
return a({ href: continueLink }, "read the rest of the thread")
continueLink = `/thread/${encoded.parent}`;
return a({ href: continueLink }, "read the rest of the thread");
}
}
};
/**
* Render an aside with a preview of comments on a message
*
*
* For posts, up to three comments are shown, for comments, up to 3 messages
* directly following this one in the thread are displayed. If there are more
* messages in the thread, a link is rendered that links to the rest of the
* context.
*
*
* @param {Object} post for which to display the aside
*/
const postAside = ({ key, value, thread }) => {
if (thread == null) return null
if (thread == null) return null;
const isComment = value.meta.postType === "comment"
const isComment = value.meta.postType === "comment";
let postsToShow
let postsToShow;
if (isComment) {
const commentPosition = thread.findIndex(msg => msg.key === key)
const commentPosition = thread.findIndex(msg => msg.key === key);
postsToShow = thread.slice(
commentPosition + 1,
Math.min(commentPosition + (THREAD_PREVIEW_LENGTH + 1), thread.length)
)
);
} else {
postsToShow = thread.slice(1, Math.min(thread.length, (THREAD_PREVIEW_LENGTH + 1)))
postsToShow = thread.slice(
1,
Math.min(thread.length, THREAD_PREVIEW_LENGTH + 1)
);
}
const fragments = postsToShow.map(postInAside)
const fragments = postsToShow.map(postInAside);
if (thread.length > (THREAD_PREVIEW_LENGTH + 1)) {
fragments.push(section(footer(continueThreadComponent(thread, isComment))))
if (thread.length > THREAD_PREVIEW_LENGTH + 1) {
fragments.push(section(footer(continueThreadComponent(thread, isComment))));
}
return div({ class: "post-aside" }, fragments)
}
return div({ class: "post-aside" }, fragments);
};
const post = ({ msg }) => {
const encoded = {
@ -446,11 +450,11 @@ const post = ({ msg }) => {
isPrivate || isRoot || isFork ? null : a({ href: url.reply }, i18n.reply),
a({ href: url.json }, i18n.json)
)
)
);
const aside = postAside(msg)
const wrapper = div({ class: "post-aside-wrapper" }, fragment, aside)
return wrapper
const aside = postAside(msg);
const wrapper = div({ class: "post-aside-wrapper" }, fragment, aside);
return wrapper;
};
exports.authorView = ({