fdfd
This commit is contained in:
parent
7a1d63af6a
commit
c9ade4253e
1 changed files with 4 additions and 4 deletions
|
@ -170,13 +170,13 @@ def message2(v, username):
|
||||||
def messagereply(v):
|
def messagereply(v):
|
||||||
|
|
||||||
message = request.form.get("body", "")[:1000].strip()
|
message = request.form.get("body", "")[:1000].strip()
|
||||||
user = request.form.get("sentto")
|
user = get_user(request.form.get("sentto"))
|
||||||
id = request.form.get("parent_id")
|
id = request.form.get("parent_id")
|
||||||
message = message.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n")
|
message = message.replace("\n", "\n\n").replace("\n\n\n\n\n\n", "\n\n").replace("\n\n\n\n", "\n\n").replace("\n\n\n", "\n\n")
|
||||||
|
|
||||||
# check existing
|
# check existing
|
||||||
existing = g.db.query(Comment).join(CommentAux).filter(Comment.author_id == v.id,
|
existing = g.db.query(Comment).join(CommentAux).filter(Comment.author_id == v.id,
|
||||||
Comment.sentto == user.id,
|
Comment.sentto == user,
|
||||||
CommentAux.body == message,
|
CommentAux.body == message,
|
||||||
).options(contains_eager(Comment.comment_aux)).first()
|
).options(contains_eager(Comment.comment_aux)).first()
|
||||||
if existing:
|
if existing:
|
||||||
|
@ -196,10 +196,10 @@ def messagereply(v):
|
||||||
g.db.flush()
|
g.db.flush()
|
||||||
new_aux = CommentAux(id=new_comment.id, body=message, body_html=text_html)
|
new_aux = CommentAux(id=new_comment.id, body=message, body_html=text_html)
|
||||||
g.db.add(new_aux)
|
g.db.add(new_aux)
|
||||||
notif = Notification(comment_id=new_comment.id, user_id=user.id)
|
notif = Notification(comment_id=new_comment.id, user_id=user)
|
||||||
g.db.add(notif)
|
g.db.add(notif)
|
||||||
|
|
||||||
cache.delete_memoized(User.notification_messages, user)
|
cache.delete_memoized(User.notification_messages, get_user(user))
|
||||||
|
|
||||||
return jsonify({"html": render_template("comments.html",
|
return jsonify({"html": render_template("comments.html",
|
||||||
v=v,
|
v=v,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue