From accde93fff286d92136e48df1abb8912f6b3ab70 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Thu, 16 Jan 2014 15:17:25 -0500
Subject: [PATCH] removed api: from server

---
 src/favourites.js        |  4 ++--
 src/socket.io/admin.js   |  8 ++++----
 src/socket.io/index.js   | 10 +++++-----
 src/socket.io/modules.js |  2 +-
 src/socket.io/topics.js  |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/favourites.js b/src/favourites.js
index cf19918d94..aba04ae89b 100644
--- a/src/favourites.js
+++ b/src/favourites.js
@@ -46,7 +46,7 @@ var db = require('./database'),
 						});
 					}
 
-					socket.emit('api:posts.favourite', {
+					socket.emit('posts.favourite', {
 						status: 'ok',
 						pid: pid
 					});
@@ -83,7 +83,7 @@ var db = require('./database'),
 						});
 					}
 
-					socket.emit('api:posts.unfavourite', {
+					socket.emit('posts.unfavourite', {
 						status: 'ok',
 						pid: pid
 					});
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index bcc647b1c2..39867f14b5 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -119,14 +119,14 @@ SocketAdmin.categories.search = function(socket, data, callback) {
 				if (!err) {
 					userObj.privileges = privileges;
 				} else {
-					winston.error('[socket api:admin.categories.search] Could not retrieve permissions');
+					winston.error('[socket admin.categories.search] Could not retrieve permissions');
 				}
 
 				next(null, userObj);
 			});
 		}, function(err, data) {
 			if (!callback) {
-				socket.emit('api:admin.categories.search', data);
+				socket.emit('admin.categories.search', data);
 			} else {
 				callback(null, data);
 			}
@@ -197,7 +197,7 @@ SocketAdmin.categories.groupsList = function(cid, callback) {
 				if (!err) {
 					groupObj.privileges = privileges;
 				} else {
-					winston.error('[socket api:admin.categories.groupsList] Could not retrieve permissions');
+					winston.error('[socket admin.categories.groupsList] Could not retrieve permissions');
 				}
 
 				next(null, groupObj);
@@ -223,7 +223,7 @@ SocketAdmin.themes.set = meta.themes.set;
 
 SocketAdmin.plugins.toggle = function(plugin_id, sessionData) {
 	plugins.toggleActive(plugin_id, function(status) {
-		sessionData.socket.emit('api:admin.plugins.toggle', status);
+		sessionData.socket.emit('admin.plugins.toggle', status);
 	});
 };
 
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 73eb9ca8eb..821f9887b8 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -94,7 +94,7 @@ Sockets.init = function() {
 					});
 				}
 
-				io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid));
+				io.sockets.in('global').emit('user.isOnline', isUserOnline(uid));
 			});
 		});
 
@@ -114,7 +114,7 @@ Sockets.init = function() {
 				}
 			}
 
-			io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid));
+			io.sockets.in('global').emit('user.isOnline', isUserOnline(uid));
 
 			emitOnlineUserCount();
 
@@ -238,11 +238,11 @@ function updateRoomBrowsingText(roomName) {
 		anonymousCount = getAnonymousCount(roomName);
 
 	if (uids.length === 0) {
-		io.sockets.in(roomName).emit('api:get_users_in_room', { users: [], anonymousCount: anonymousCount });
+		io.sockets.in(roomName).emit('get_users_in_room', { users: [], anonymousCount: anonymousCount });
 	} else {
 		user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture'], function(err, users) {
 			if(!err) {
-				io.sockets.in(roomName).emit('api:get_users_in_room', { users: users, anonymousCount: anonymousCount });
+				io.sockets.in(roomName).emit('get_users_in_room', { users: users, anonymousCount: anonymousCount });
 			}
 		});
 	}
@@ -284,7 +284,7 @@ function emitOnlineUserCount(callback) {
 	if (callback) {
 		callback(returnObj);
 	} else {
-		io.sockets.emit('api:user.active.get', returnObj);
+		io.sockets.emit('user.active.get', returnObj);
 	}
 }
 
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index a85a38bb2d..5b6ea68f7a 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -137,7 +137,7 @@ SocketModules.chats.send = function(data, sessionData) {
 SocketModules.chats.list = function(callback, sessionData) {
 	Messaging.getRecentChats(sessionData.uid, function(err, uids) {
 		if (err) {
-			winston.warn('[(socket) api:chats.list] Problem retrieving chats: ' + err.message);
+			winston.warn('[(socket) chats.list] Problem retrieving chats: ' + err.message);
 		}
 
 		callback(uids || []);
diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js
index 43e8b8e127..6405fc9a01 100644
--- a/src/socket.io/topics.js
+++ b/src/socket.io/topics.js
@@ -86,7 +86,7 @@ SocketTopics.delete = function(data, callback, sessionData) {
 				if (!err) {
 					module.parent.exports.emitTopicPostStats();
 					if (callback) {
-						callback('api:topic.delete', {
+						callback('topic.delete', {
 							status: 'ok',
 							tid: data.tid
 						});
@@ -104,7 +104,7 @@ SocketTopics.restore = function(data, callback, sessionData) {
 				module.parent.exports.emitTopicPostStats();
 
 				if (callback) {
-					callback('api:topic.restore', {
+					callback('topic.restore', {
 						status: 'ok',
 						tid: data.tid
 					});
@@ -220,7 +220,7 @@ SocketTopics.loadMoreRecentTopics = function(data, callback, sessionData) {
 		if (!err) {
 			callback(latestTopics);
 		} else {
-			winston.error('[socket api:topics.loadMoreRecentTopics] ' + err.message);
+			winston.error('[socket topics.loadMoreRecentTopics] ' + err.message);
 		}
 	});
 };