mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 14:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

fix: ts

Browse source
This commit is contained in:
hossein 2024-02-25 13:15:56 +03:30
parent 6764409448
commit 9307f66c27
1 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/node/handler/PadMessageHandler.ts
View file

@ -161,11 +161,7 @@ exports.handleConnect = (socket:any) => {
/** /**
* Kicks all sessions from a pad * Kicks all sessions from a pad
*/ */
<<<<<<< HEAD:src/node/handler/PadMessageHandler.ts
exports.kickSessionsFromPad = (padID: string) => { exports.kickSessionsFromPad = (padID: string) => {
=======
exports.kickSessionsFromPad = (padID) => {
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/node/handler/PadMessageHandler.js
if (typeof socketio.sockets.clients !== 'object') return; if (typeof socketio.sockets.clients !== 'object') return;
// skip if there is nobody on this pad // skip if there is nobody on this pad
@ -669,11 +665,7 @@ const handleUserChanges = async (socket:any, message: typeof ChatMessage) => {
thisSession.rev = newRev; thisSession.rev = newRev;
if (newRev !== r) thisSession.time = await pad.getRevisionDate(newRev); if (newRev !== r) thisSession.time = await pad.getRevisionDate(newRev);
await exports.updatePadClients(pad); await exports.updatePadClients(pad);
<<<<<<< HEAD:src/node/handler/PadMessageHandler.ts
} catch (err:any) { } catch (err:any) {
=======
} catch (err) {
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/node/handler/PadMessageHandler.js
socket.emit('message', {disconnect: 'badChangeset'}); socket.emit('message', {disconnect: 'badChangeset'});
stats.meter('failedChangesets').mark(); stats.meter('failedChangesets').mark();
messageLogger.warn(`Failed to apply USER_CHANGES from author ${thisSession.author} ` + messageLogger.warn(`Failed to apply USER_CHANGES from author ${thisSession.author} ` +
@ -732,11 +724,7 @@ exports.updatePadClients = async (pad: PadType) => {
}; };
try { try {
socket.emit('message', msg); socket.emit('message', msg);
<<<<<<< HEAD:src/node/handler/PadMessageHandler.ts
} catch (err:any) { } catch (err:any) {
=======
} catch (err) {
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/node/handler/PadMessageHandler.js
messageLogger.error(`Failed to notify user of new revision: ${err.stack || err}`); messageLogger.error(`Failed to notify user of new revision: ${err.stack || err}`);
return; return;
} }
@ -1263,11 +1251,6 @@ const _getRoomSockets = (padID: string) => {
// it does here, but synchronously to avoid a race condition. This code will have to change when // it does here, but synchronously to avoid a race condition. This code will have to change when
// we update to socket.io v3. // we update to socket.io v3.
const room = ns.adapter.rooms?.get(padID); const room = ns.adapter.rooms?.get(padID);
<<<<<<< HEAD:src/node/handler/PadMessageHandler.ts
=======
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/node/handler/PadMessageHandler.js
if (!room) return []; if (!room) return [];
return Array.from(room) return Array.from(room)