diff --git a/app/common b/app/common index 111b607..7d190ac 160000 --- a/app/common +++ b/app/common @@ -1 +1 @@ -Subproject commit 111b60787080a1443d3d1ac09ea793b2eb605ca2 +Subproject commit 7d190acf4fce23ae19b6064a94b15c6548c00765 diff --git a/app/service/service_manager.py b/app/service/service_manager.py index 950e720..bd1230c 100644 --- a/app/service/service_manager.py +++ b/app/service/service_manager.py @@ -2,6 +2,7 @@ from app.common.service.entry import ServiceSettings from app.service.service import Service from app.service.subscriber_client import SubscriberConnection from app.common.subscriber.entry import Subscriber +from app.common.constants import PlayerMessage from pyfastocloud.subscriber_client import Commands from pyfastocloud.client import make_utc_timestamp from pyfastocloud.client_handler import IClientHandler, Request, Response, ClientStatus @@ -213,7 +214,7 @@ class ServiceManager(IClientHandler): return connections - def send_message(self, email: str, message: str, ttl: int): + def send_message(self, email: str, message: PlayerMessage): for user in self._subscribers: if user.info and user.info.email == email: - user.send_message(user.gen_request_id(), message, ttl * 1000) + user.send_message(user.gen_request_id(), message.message, message.type, message.ttl * 1000) diff --git a/app/service/view.py b/app/service/view.py index 741a50a..c8a2aaa 100644 --- a/app/service/view.py +++ b/app/service/view.py @@ -277,7 +277,7 @@ class ServiceView(FlaskView): subscriber = Subscriber.objects(id=sid).first() form = MessageForm() if request.method == 'POST' and form.validate_on_submit(): - servers_manager.send_message(subscriber.email, form.message.data, form.ttl.data) + servers_manager.send_message(subscriber.email, form.get_data()) return jsonify(status='ok'), 200 return render_template('service/subscriber/send_message.html', form=form) diff --git a/app/templates/service/subscriber/send_message.html b/app/templates/service/subscriber/send_message.html index 6244415..b0a7cd6 100644 --- a/app/templates/service/subscriber/send_message.html +++ b/app/templates/service/subscriber/send_message.html @@ -23,6 +23,8 @@
{{ render_bootstrap_field(form.message) }}
+ {{ render_bootstrap_field(form.type) }} +
{{ render_bootstrap_field(form.ttl) }}