github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-06-24 19:51:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Pusher cluster option. closes #6

Browse Source
This commit is contained in:
Daniel Klabbers
2016-03-11 09:17:54 +10:30
committed by Toby Zerner
parent 392200ef3b
commit 159847fec0
5 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/pusher/js/admin/dist/extension.js vendored
View File

@ -55,6 +55,15 @@ System.register('flarum/pusher/components/PusherSettingsModal', ['flarum/compone
app.translator.trans('flarum-pusher.admin.pusher_settings.app_secret_label') app.translator.trans('flarum-pusher.admin.pusher_settings.app_secret_label')
), ),
m('input', { className: 'FormControl', bidi: this.setting('flarum-pusher.app_secret') }) m('input', { className: 'FormControl', bidi: this.setting('flarum-pusher.app_secret') })
), m(
'div',
{ className: 'Form-group' },
m(
'label',
null,
app.translator.trans('flarum-pusher.admin.pusher_settings.app_cluster_label')
),
m('input', { className: 'FormControl', bidi: this.setting('flarum-pusher.app_cluster') })
)]; )];
} }
}]); }]);

5
extensions/pusher/js/admin/src/components/PusherSettingsModal.js
View File

@ -24,6 +24,11 @@ export default class PusherSettingsModal extends SettingsModal {
<div className="Form-group"> <div className="Form-group">
<label>{app.translator.trans('flarum-pusher.admin.pusher_settings.app_secret_label')}</label> <label>{app.translator.trans('flarum-pusher.admin.pusher_settings.app_secret_label')}</label>
<input className="FormControl" bidi={this.setting('flarum-pusher.app_secret')}/> <input className="FormControl" bidi={this.setting('flarum-pusher.app_secret')}/>
</div>,
<div className="Form-group">
<label>{app.translator.trans('flarum-pusher.admin.pusher_settings.app_cluster_label')}</label>
<input className="FormControl" bidi={this.setting('flarum-pusher.app_cluster')}/>
</div> </div>
]; ];
} }

1
extensions/pusher/js/forum/dist/extension.js vendored
View File

@ -26,6 +26,7 @@ System.register('flarum/pusher/main', ['flarum/extend', 'flarum/app', 'flarum/co
$.getScript('//js.pusher.com/3.0/pusher.min.js', function () { $.getScript('//js.pusher.com/3.0/pusher.min.js', function () {
var socket = new Pusher(app.forum.attribute('pusherKey'), { var socket = new Pusher(app.forum.attribute('pusherKey'), {
authEndpoint: app.forum.attribute('apiUrl') + '/pusher/auth', authEndpoint: app.forum.attribute('apiUrl') + '/pusher/auth',
cluster: app.forum.attribute('pusherCluster'),
auth: { auth: {
headers: { headers: {
'X-CSRF-Token': app.session.csrfToken 'X-CSRF-Token': app.session.csrfToken

1
extensions/pusher/js/forum/src/main.js
View File

@ -13,6 +13,7 @@ app.initializers.add('flarum-pusher', () => {
$.getScript('//js.pusher.com/3.0/pusher.min.js', () => { $.getScript('//js.pusher.com/3.0/pusher.min.js', () => {
const socket = new Pusher(app.forum.attribute('pusherKey'), { const socket = new Pusher(app.forum.attribute('pusherKey'), {
authEndpoint: app.forum.attribute('apiUrl') + '/pusher/auth', authEndpoint: app.forum.attribute('apiUrl') + '/pusher/auth',
cluster: app.forum.attribute('pusherCluster'),
auth: { auth: {
headers: { headers: {
'X-CSRF-Token': app.session.csrfToken 'X-CSRF-Token': app.session.csrfToken

1
extensions/pusher/src/Listener/AddPusherApi.php
View File

@ -49,6 +49,7 @@ class AddPusherApi
{ {
if ($event->isSerializer(ForumSerializer::class)) { if ($event->isSerializer(ForumSerializer::class)) {
$event->attributes['pusherKey'] = $this->settings->get('flarum-pusher.app_key'); $event->attributes['pusherKey'] = $this->settings->get('flarum-pusher.app_key');
$event->attributes['pusherCluster'] = $this->settings->get('flarum-pusher.app_cluster', 'us');
} }
} }