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

Merge pull request #244 from christianbundy/private-latest 

Remove private posts from public views
This commit is contained in:
Cinnamon 2020-02-19 14:23:04 -08:00 committed by GitHub
parent 6f5de95d01 a775c99421
commit cf05f46dec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/models.js
View File

@ -20,6 +20,10 @@ const defaultOptions = {
meta: true
};
const publicOnlyFilter = pull.filter(
message => lodash.get(message, "value.meta.private", false) === false
);
/** @param {object[]} customOptions */
const configure = (...customOptions) =>
Object.assign({}, defaultOptions, ...customOptions);
@ -720,8 +724,7 @@ module.exports = ({ cooler, isPublic }) => {
}
}
],
index: "DTA",
private: false
index: "DTA"
})
);
const followingFilter = await socialFilter({ following: true });
@ -730,11 +733,7 @@ module.exports = ({ cooler, isPublic }) => {
pull(
source,
followingFilter,
pull.filter(
(
message // avoid private messages (!)
) => typeof message.value.content !== "string"
),
publicOnlyFilter,
pull.take(maxMessages),
pull.collect((err, collectedMessages) => {
if (err) {
@ -766,8 +765,7 @@ module.exports = ({ cooler, isPublic }) => {
}
}
],
index: "DTA",
private: false
index: "DTA"
})
);
@ -779,7 +777,7 @@ module.exports = ({ cooler, isPublic }) => {
const messages = await new Promise((resolve, reject) => {
pull(
source,
pull.filter(message => typeof message.value.content !== "string"),
publicOnlyFilter,
extendedFilter,
pull.take(maxMessages),
pull.collect((err, collectedMessages) => {
@ -812,8 +810,7 @@ module.exports = ({ cooler, isPublic }) => {
}
}
],
index: "DTA",
private: false
index: "DTA"
})
);
@ -824,11 +821,8 @@ module.exports = ({ cooler, isPublic }) => {
const messages = await new Promise((resolve, reject) => {
pull(
source,
pull.filter(
message =>
typeof message.value.content !== "string" &&
message.value.content.root == null
),
publicOnlyFilter,
pull.filter(message => message.value.content.root == null),
extendedFilter,
pull.take(maxMessages),
pull.collect((err, collectedMessages) => {
@ -926,8 +920,7 @@ module.exports = ({ cooler, isPublic }) => {
}
}
],
index: "DTA",
private: false
index: "DTA"
})
);
const followingFilter = await socialFilter({ following: true });
@ -935,6 +928,7 @@ module.exports = ({ cooler, isPublic }) => {
const messages = await new Promise((resolve, reject) => {
pull(
source,
publicOnlyFilter,
pull.filter(msg => {
return (
typeof msg.value.content === "object" &&