andrei/Moona
andrei/Moona
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлена ошибка удаления постов и отображении понравившихся постов на главной странице

Browse Source
This commit is contained in:
Andrei 2022-05-20 21:57:42 +05:00
parent 1589b99abd
commit e8c0f940b8
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.py
View File

@ -104,11 +104,15 @@ def main_page():
emotion['is_like'] = 1 emotion['is_like'] = 1
emotion_for_you.append(emotion) emotion_for_you.append(emotion)
if current_user.is_authenticated: if current_user.is_authenticated:
you_like_that = sorted(list(map(lambda x: session.query(DiaryPost).filter(DiaryPost.id == x).first(), try:
you_like_that = sorted(
list(map(lambda x: session.query(DiaryPost).filter(DiaryPost.id == x, DiaryPost.public == 1).first(),
map(lambda x: x.post, map(lambda x: x.post,
session.query(Like).filter(Like.user == current_user.id).all()))), session.query(Like).filter(Like.user == current_user.id).all()))),
key=lambda x: ( key=lambda x: (
len(x.text), 1 if x.photo else 0, -(x.date - datetime.datetime.now()).days)) len(x.text), 1 if x.photo else 0, -(x.date - datetime.datetime.now()).days))
except Exception:
you_like_that = []
emotion_you_like_that = [] emotion_you_like_that = []
for i in you_like_that: for i in you_like_that:
emotion = {id: i.id, 'pos_emot': [], 'nig_emot': [], 'link': [], emotion = {id: i.id, 'pos_emot': [], 'nig_emot': [], 'link': [],
@ -420,11 +424,12 @@ def answer_quest(id):
answer = AnswerQuest() answer = AnswerQuest()
quest = session.query(Quest).filter(Quest.id == id).first() quest = session.query(Quest).filter(Quest.id == id).first()
if request.method == 'GET': if request.method == 'GET':
if session.query(Answer).filter(Answer.id_question == id).first(): if session.query(Answer).filter(Answer.id_question == id, Answer.user == current_user.id).first():
ans_quest = session.query(Answer).filter(Answer.id_question == id).first() ans_quest = session.query(Answer).filter(Answer.id_question == id,
Answer.user == current_user.id).first()
answer.answer.data = ans_quest.answer answer.answer.data = ans_quest.answer
if answer.validate_on_submit(): if answer.validate_on_submit():
if not session.query(Answer).filter(Answer.id_question == id).first(): if not session.query(Answer).filter(Answer.id_question == id, Answer.user == current_user.id).first():
answer_user = Answer(id_question=id, answer_user = Answer(id_question=id,
answer=answer.answer.data, answer=answer.answer.data,
user=current_user.id, user=current_user.id,
@ -563,6 +568,13 @@ def post_deleted(id):
if pos: if pos:
if pos.photo: if pos.photo:
os.remove(pos.photo[3:]) os.remove(pos.photo[3:])
if pos.public == 1:
likes = session.query(Like).filter(Like.post == pos.id).all()
if likes:
map(lambda i: session.delete(i), likes)
pop = session.query(Popularity).filter(Popularity.post == pos.id).first()
if pop:
session.delete(pop)
session.delete(pos) session.delete(pos)
session.commit() session.commit()
else: else: