From 33b6626fd9e78e644c44740513f2c8c2f9745eb8 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 4 Apr 2014 17:08:14 +0100 Subject: [PATCH] killed CollaberationManager R.I.P --- .../controllers/ProjectController.coffee | 2 +- .../managers/CollaberationManager.coffee | 25 ------------------- services/web/app/coffee/router.coffee | 9 +------ 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 services/web/app/coffee/managers/CollaberationManager.coffee diff --git a/services/web/app/coffee/controllers/ProjectController.coffee b/services/web/app/coffee/controllers/ProjectController.coffee index 52e89d29d4..3b98193f4e 100755 --- a/services/web/app/coffee/controllers/ProjectController.coffee +++ b/services/web/app/coffee/controllers/ProjectController.coffee @@ -18,7 +18,7 @@ SubscriptionFormatters = require("../Features/Subscription/SubscriptionFormatter FileStoreHandler = require("../Features/FileStore/FileStoreHandler") module.exports = class ProjectController - constructor: (@collaberationManager)-> + constructor: ()-> ProjectHandler = new ProjectHandler() list: (req, res, next)-> diff --git a/services/web/app/coffee/managers/CollaberationManager.coffee b/services/web/app/coffee/managers/CollaberationManager.coffee deleted file mode 100644 index e5e4e85cfd..0000000000 --- a/services/web/app/coffee/managers/CollaberationManager.coffee +++ /dev/null @@ -1,25 +0,0 @@ -#this file is being slowly refactored out - -logger = require('logger-sharelatex') -sanitize = require('sanitizer') -projectHandler = require('../handlers/ProjectHandler') -projectHandler = new projectHandler() -SecurityManager = require('./SecurityManager') -_ = require('underscore') -projectEditorHandler = require('../Features/Project/ProjectEditorHandler') -projectEntityHandler = require('../Features/Project/ProjectEntityHandler') -versioningApiHandler = require('../Features/Versioning/VersioningApiHandler') -metrics = require('../infrastructure/Metrics') -EditorRealTimeController = require('../Features/Editor/EditorRealTimeController') - -module.exports = class CollaberationManager - constructor: (@io)-> - - distributMessage: (project_id, client, message)-> - message = sanitize.escape(message) - metrics.inc "editor.instant-message" - client.get "first_name", (err, first_name)=> - EditorRealTimeController.emitToRoom project_id, 'reciveNewMessage', first_name, message - - takeVersionSnapShot : (project_id, message, callback)-> - versioningApiHandler.takeVersionSnapshot project_id, message, callback diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index eb0297d834..90d1cf3379 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -5,7 +5,6 @@ ProjectController = require("./controllers/ProjectController") ProjectApiController = require("./Features/Project/ProjectApiController") InfoController = require('./controllers/InfoController') SpellingController = require('./Features/Spelling/SpellingController') -CollaberationManager = require('./managers/CollaberationManager') SecurityManager = require('./managers/SecurityManager') AuthorizationManager = require('./Features/Security/AuthorizationManager') versioningController = require("./Features/Versioning/VersioningApiController") @@ -46,9 +45,7 @@ module.exports = class Router constructor: (app, io, socketSessions)-> app.use(app.router) - collaberationManager = new CollaberationManager(io) - - Project = new ProjectController(collaberationManager) + Project = new ProjectController() projectHandler = new ProjectHandler() app.get '/', HomeController.index @@ -326,10 +323,6 @@ module.exports = class Router AuthorizationManager.ensureClientCanViewProject client, (error, project_id) => CompileManager.getLogLines project_id, callback - client.on 'distributMessage', (message)-> - AuthorizationManager.ensureClientCanViewProject client, (error, project_id) => - collaberationManager.distributMessage project_id, client, message - client.on 'changeUsersPrivlageLevel', (user_id, newPrivalageLevel)-> AuthorizationManager.ensureClientCanAdminProject client, (error, project_id) => projectHandler.changeUsersPrivlageLevel project_id, user_id, newPrivalageLevel