Skip to content

Commit 573c760

Browse files
committed
Various fixes
1 parent 98601a3 commit 573c760

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

packages/example-forum/lib/components/comments/CommentsItem.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class CommentsItem extends PureComponent {
2222
}
2323

2424
replyCancelCallback(event) {
25-
event.preventDefault();
2625
this.setState({showReply: false});
2726
}
2827

@@ -36,7 +35,6 @@ class CommentsItem extends PureComponent {
3635
}
3736

3837
editCancelCallback(event) {
39-
event.preventDefault();
4038
this.setState({showEdit: false});
4139
}
4240

packages/example-forum/lib/modules/posts/parameters.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import moment from 'moment';
99
import { addCallback } from 'meteor/vulcan:core';
1010

1111
// Add 'after' and 'before' properties to terms which can be used to limit posts in time.
12-
function addTimeParameter (parameters, terms, apolloClient) {
12+
function PostsAddBeforeAfterParameters (parameters, terms, apolloClient) {
1313

14-
// console.log('// addTimeParameter')
14+
// console.log('// addBeforeAfterParameters')
1515

1616
if (typeof parameters.selector.postedAt === 'undefined') {
1717

@@ -86,4 +86,4 @@ function addTimeParameter (parameters, terms, apolloClient) {
8686

8787
return parameters;
8888
}
89-
addCallback('posts.parameters', addTimeParameter);
89+
addCallback('posts.parameters', PostsAddBeforeAfterParameters);

packages/example-forum/lib/server/posts/callbacks/embedly.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Callbacks to add media/thumbnail after submit and on edit
55
*/
66

77
import { addCallback, getSetting } from 'meteor/vulcan:core';
8-
import Embed from 'meteor/vulcan:embed';
8+
import { Embed } from 'meteor/vulcan:embed';
99

1010
const embedProvider = getSetting('embedProvider');
1111

packages/example-forum/lib/server/posts/callbacks/other.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@ addCallback('users.remove.async', UsersRemoveDeletePosts);
8585
Posts.increaseClicks = (post, ip) => {
8686
if (getSetting('forum.trackClickEvents', true)) {
8787
// make sure this IP hasn't previously clicked on this post
88-
const existingClickEvent = Events.findOne({ name: 'click', 'properties.postId': post._id, 'properties.ip': ip });
88+
let existingClickEvent = false;
89+
try {
90+
existingClickEvent = Events.findOne({name: 'click', 'properties.postId': post._id, 'properties.ip': ip});
91+
} catch (error) {
92+
console.error(error);
93+
}
8994

9095
if (!existingClickEvent) {
9196
// Events.log(clickEvent); // Sidebar only: don't log event

packages/example-forum/lib/server/posts/callbacks/voting.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { performVoteServer } from 'meteor/vulcan:voting';
1414
*/
1515
function PostsNewUpvoteOwnPost(post) {
1616
var postAuthor = Users.findOne(post.userId);
17-
return {...post, ...performVoteServer({ document: post, voteType: 'upvote', collection: Posts, user: postAuthor })};
17+
return {...post, ...performVoteServer({ document: post, voteType: 'upvote', collection: Posts, user: postAuthor, updateDocument: true })};
1818
}
1919

2020
addCallback('posts.new.after', PostsNewUpvoteOwnPost);

packages/example-forum/lib/server/posts/out.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ Picker.route('/out', ({ query}, req, res, next) => {
1414

1515
try {
1616

17-
// decode url just in case
18-
const decodedUrl = decodeURIComponent(query.url);
19-
20-
const post = Posts.findOne({url: {$regex: escapeStringRegexp(decodedUrl)}}, {sort: {postedAt: -1, createdAt: -1}});
17+
const post = Posts.findOne({url: {$regex: escapeStringRegexp(query.url)}}, {sort: {postedAt: -1, createdAt: -1}});
2118

2219
if (post) {
2320
const ip = req.headers && req.headers['x-forwarded-for'] || req.connection.remoteAddress;

0 commit comments

Comments
 (0)