Browse Source

Fix profile message, conference, and chat route

Joost Sijm 4 years ago
parent
commit
ad7ff0fdfc
1 changed files with 10 additions and 8 deletions
  1. 10 8
      app/flaskr.py

+ 10 - 8
app/flaskr.py

@@ -12,6 +12,8 @@ from flask import render_template, request, redirect, \
 from flask_breadcrumbs import Breadcrumbs, register_breadcrumb
 from flask_menu import Menu, register_menu
 from flask_login import login_required, login_user, logout_user
+from rival_regions_wrapper.wrapper import Profile, Conference, LanguageChat
+
 from app import app, db, rrclient, alt_rrclient
 from app.models import User, Log, Key
 
@@ -239,9 +241,9 @@ def api_send_chat(language):
 
     alt = request.args.get('alt')
     if alt and alt.lower() == 'true':
-        alt_rrclient.send_chat(language, message)
+        LanguageChat(alt_rrclient, language).message(message)
     else:
-        rrclient.send_chat(language, message)
+        LanguageChat(rrclient, language).message(message)
 
     log.succes = True
     db.session.commit()
@@ -272,9 +274,9 @@ def api_send_personal_message(user_id):
 
     alt = request.args.get('alt')
     if alt and alt.lower() == 'true':
-        alt_rrclient.send_personal_message(user_id, message)
+        Profile(alt_rrclient, profile_id).message(message)
     else:
-        rrclient.send_personal_message(user_id, message)
+        Profile(rrclient, profile_id).message(message)
 
     log.succes = True
     db.session.commit()
@@ -305,9 +307,9 @@ def api_send_conference_message(conference_id):
 
     alt = request.args.get('alt')
     if alt and alt.lower() == 'true':
-        alt_rrclient.send_conference_message(conference_id, message)
+        Conference(alt_rrclient, conference_id).message(message)
     else:
-        rrclient.send_conference_message(conference_id, message)
+        Conference(rrclient, conference_id).message(message)
 
     log.succes = True
     db.session.commit()
@@ -342,9 +344,9 @@ def api_send_conference_notification(conference_id):
 
     alt = request.args.get('alt')
     if alt and alt.lower() == 'true':
-        alt_rrclient.send_conference_notification(conference_id, message, sound)
+        Conference(alt_rrclient, conference_id).notification(message, sound)
     else:
-        rrclient.send_conference_notification(conference_id, message, sound)
+        Conference(rrclient, conference_id).notification(message, sound)
 
     log.succes = True
     db.session.commit()