github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 14:23:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Do not live-load posts from ignored users

Browse Source
This commit is contained in:
David Taylor 2019-06-11 12:07:14 +01:00
parent 6612218a4e
commit 000a35b219
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/models/post-stream.js.es6
View File

@ -609,7 +609,11 @@ export default RestModel.extend({
this.set("loadingLastPost", true);
return this.findPostsByIds([postId])
.then(posts => {
posts.forEach(p => this.appendPost(p));
const ignoredUsers = this.get("currentUser.ignored_users");
posts.forEach(p => {
if (ignoredUsers && ignoredUsers.includes(p.username)) return;
this.appendPost(p);
});
})
.finally(() => {
this.set("loadingLastPost", false);

38
test/javascripts/models/post-stream-test.js.es6
View File

@ -800,6 +800,44 @@ QUnit.test("comitting and triggerNewPostInStream race condition", assert => {
);
});
QUnit.test("triggerNewPostInStream for ignored posts", async assert => {
const postStream = buildStream(280, [1]);
const store = postStream.store;
postStream.currentUser = Discourse.User.create({
username: "eviltrout",
name: "eviltrout",
id: 321,
ignored_users: ["ignoreduser"]
});
postStream.appendPost(store.createRecord("post", { id: 1, post_number: 1 }));
const post2 = store.createRecord("post", {
id: 101,
post_number: 2,
username: "regularuser"
});
const post3 = store.createRecord("post", {
id: 102,
post_number: 3,
username: "ignoreduser"
});
var stub = sandbox
.stub(postStream, "findPostsByIds")
.returns(Promise.resolve([post2]));
await postStream.triggerNewPostInStream(101);
assert.equal(postStream.get("posts.length"), 2, "it added the regular post");
stub.restore();
sandbox.stub(postStream, "findPostsByIds").returns(Promise.resolve([post3]));
postStream.triggerNewPostInStream(102);
assert.equal(postStream.posts.length, 2, "it does not add the ignored post");
});
QUnit.test("postsWithPlaceholders", assert => {
const postStream = buildStream(4964, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
const postsWithPlaceholders = postStream.get("postsWithPlaceholders");