sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-16 11:00:41 +00:00
Code Issues Projects Releases Wiki Activity

rename extension extras

Browse Source
This commit is contained in:
Patrick Jentsch
2024-04-18 15:35:41 +02:00
parent 8f960cf359
commit c191e7bd4a
17 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/users/events.py
View File

@ -1,12 +1,12 @@
from flask_login import current_user
from flask_socketio import join_room, leave_room
from app import hashids, socketio
from app.decorators import socketio_login_required
from app.extensions.flask_socketio_extras import login_required
from app.models import User
@socketio.on('GET /users/<user_id>')
@socketio_login_required
@login_required
def get_user(user_hashid):
user_id = hashids.decode(user_hashid)
user = User.query.get(user_id)
@ -22,7 +22,7 @@ def get_user(user_hashid):
@socketio.on('SUBSCRIBE /users/<user_id>')
@socketio_login_required
@login_required
def subscribe_user(user_hashid):
user_id = hashids.decode(user_hashid)
user = User.query.get(user_id)
@ -35,7 +35,7 @@ def subscribe_user(user_hashid):
@socketio.on('UNSUBSCRIBE /users/<user_id>')
@socketio_login_required
@login_required
def unsubscribe_user(user_hashid):
user_id = hashids.decode(user_hashid)
user = User.query.get(user_id)

20
app/users/nevents.py
View File

@ -1,12 +1,12 @@
from flask_login import current_user
from flask_socketio import join_room, leave_room
from flask_socketio import join_room
from app import hashids, socketio
from app.decorators import socketio_admin_required, socketio_login_required
from app.extensions.flask_socketio_extras import admin_required, login_required
from app.models import User
@socketio.on('GET /users')
@socketio_admin_required
@admin_required
def get_users():
users = User.query.filter_by().all()
return {
@ -20,14 +20,14 @@ def get_users():
@socketio.on('SUBSCRIBE /users')
@socketio_admin_required
@admin_required
def subscribe_users():
join_room('/users')
return {'options': {'status': 200, 'statusText': 'OK'}}
@socketio.on('GET /users/<user_id>')
@socketio_login_required
@login_required
def get_user(user_hashid):
user_id = hashids.decode(user_hashid)
user = User.query.get(user_id)
@ -46,7 +46,7 @@ def get_user(user_hashid):
@socketio.on('SUBSCRIBE /users/<user_id>')
@socketio_login_required
@login_required
def subscribe_user(user_hashid):
user_id = hashids.decode(user_hashid)
user = User.query.get(user_id)
@ -59,7 +59,7 @@ def subscribe_user(user_hashid):
@socketio.on('GET /public_users')
@socketio_login_required
@login_required
def get_public_users():
users = User.query.filter_by(is_public=True).all()
return {
@ -76,14 +76,14 @@ def get_public_users():
@socketio.on('SUBSCRIBE /users')
@socketio_admin_required
@admin_required
def subscribe_users():
join_room('/public_users')
return {'options': {'status': 200, 'statusText': 'OK'}}
@socketio.on('GET /public_users/<user_id>')
@socketio_login_required
@login_required
def get_user(user_hashid):
user_id = hashids.decode(user_hashid)
user = User.query.filter_by(id=user_id, is_public=True).first()
@ -102,7 +102,7 @@ def get_user(user_hashid):
@socketio.on('SUBSCRIBE /public_users/<user_id>')
@socketio_login_required
@login_required
def subscribe_user(user_hashid):
user_id = hashids.decode(user_hashid)
user = User.query.filter_by(id=user_id, is_public=True).first()

2
app/users/settings/forms.py
View File

@ -16,7 +16,7 @@ from wtforms.validators import (
Regexp
)
from app.models import User, UserSettingJobStatusMailNotificationLevel
from app.extensions.wtforms.validators import FileSize
from app.extensions.wtforms_extras.validators import FileSize
class UpdateAccountInformationForm(FlaskForm):