mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2025-06-11 16:40:40 +00:00
Update CorpusFollowerAssociation table
This commit is contained in:
@ -74,15 +74,15 @@ def disable_corpus_is_public(corpus_id):
|
||||
@bp.route('/<hashid:corpus_id>/followers/<hashid:follower_id>/unfollow', methods=['POST'])
|
||||
@login_required
|
||||
def unfollow_corpus(corpus_id, follower_id):
|
||||
corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404()
|
||||
if not (corpus_follower_association.followed_corpus.user == current_user
|
||||
or corpus_follower_association.following_user == current_user
|
||||
or current_user.is_administrator()):
|
||||
corpus = Corpus.query.get_or_404(corpus_id)
|
||||
follower = User.query.get_or_404(follower_id)
|
||||
if not (corpus.user == current_user or follower == current_user or current_user.is_administrator()):
|
||||
abort(403)
|
||||
if not corpus_follower_association.following_user.is_following_corpus(corpus_follower_association.followed_corpus):
|
||||
if not follower.is_following_corpus(corpus):
|
||||
abort(409) # 'User is not following the corpus'
|
||||
corpus_follower_association.following_user.unfollow_corpus(corpus_follower_association.followed_corpus)
|
||||
follower.unfollow_corpus(corpus)
|
||||
db.session.commit()
|
||||
flash(f'{follower.username} is not following {corpus.title} anymore', category='corpus')
|
||||
return '', 204
|
||||
|
||||
|
||||
@ -103,10 +103,9 @@ def add_permission(corpus_id, follower_id, permission_name):
|
||||
try:
|
||||
permission = CorpusFollowerPermission[permission_name]
|
||||
except KeyError:
|
||||
abort(409) # 'Permission "{permission_name}" does not exist'
|
||||
corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404()
|
||||
if not (corpus_follower_association.followed_corpus.user == current_user
|
||||
or current_user.is_administrator()):
|
||||
abort(409) # f'Permission "{permission_name}" does not exist'
|
||||
corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404()
|
||||
if not (corpus_follower_association.corpus.user == current_user or current_user.is_administrator()):
|
||||
abort(403)
|
||||
corpus_follower_association.add_permission(permission)
|
||||
db.session.commit()
|
||||
@ -119,9 +118,8 @@ def remove_permission(corpus_id, follower_id, permission_name):
|
||||
permission = CorpusFollowerPermission[permission_name]
|
||||
except KeyError:
|
||||
return make_response(f'Permission "{permission_name}" does not exist', 409)
|
||||
corpus_follower_association = CorpusFollowerAssociation.query.filter_by(followed_corpus_id=corpus_id, following_user_id=follower_id).first_or_404()
|
||||
if not (corpus_follower_association.followed_corpus.user == current_user
|
||||
or current_user.is_administrator()):
|
||||
corpus_follower_association = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=follower_id).first_or_404()
|
||||
if not (corpus_follower_association.corpus.user == current_user or current_user.is_administrator()):
|
||||
abort(403)
|
||||
corpus_follower_association.remove_permission(permission)
|
||||
db.session.commit()
|
||||
|
Reference in New Issue
Block a user