graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 10:53:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

後方互換性を追加

Browse source
This commit is contained in:
syuilo 2018-10-07 17:19:52 +09:00
parent 10af684804
commit e05acb8d18
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/api/stream/index.ts
View file

@ -174,7 +174,7 @@ export default class Connection {
* チャンネルに接続
*/
@autobind
private connectChannel(id: string, params: any, channelClass: { new(id: string, connection: Connection): Channel }) {
public connectChannel(id: string, params: any, channelClass: { new(id: string, connection: Connection): Channel }) {
const channel = new channelClass(id, this);
this.channels.push(channel);
channel.init(params);
@ -185,7 +185,7 @@ export default class Connection {
* @param id チャンネルコネクションID
*/
@autobind
private disconnectChannel(id: string) {
public disconnectChannel(id: string) {
const channel = this.channels.find(c => c.id === id);
if (channel) {

22
src/server/api/streaming.ts
View file

@ -5,6 +5,7 @@ import Xev from 'xev';
import MainStreamConnection from './stream';
import { ParsedUrlQuery } from 'querystring';
import authenticate from './authenticate';
import channels from './stream/channels';
module.exports = (server: http.Server) => {
// Init websocket server
@ -22,6 +23,27 @@ module.exports = (server: http.Server) => {
const main = new MainStreamConnection(connection, ev, user, app);
// 後方互換性のため
if (request.resourceURL.pathname !== '/streaming') {
main.sendMessageToWs = (type: string, payload: any) => {
if (type == 'channel') {
type = payload.type;
payload = payload.body;
}
connection.send(JSON.stringify({
type: type,
body: payload
}));
};
if (request.resourceURL.pathname === '/') {
main.connectChannel(Math.random().toString(), null,
request.resourceURL.pathname === '/' ? channels.homeTimeline :
request.resourceURL.pathname === '/local-timeline' ? channels.localTimeline :
request.resourceURL.pathname === '/hybrid-timeline' ? channels.hybridTimeline :
request.resourceURL.pathname === '/global-timeline' ? channels.globalTimeline : null);
}
}
connection.once('close', () => {
ev.removeAllListeners();
main.dispose();