Follow Method and database updates

app/lib/lib/roomTypes/newsfeed.js

@@ -1,10 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 
-import { openRoom } from '../../../ui-utils';
 import { ChatRoom, ChatSubscription } from '../../../models';
+import { openRoom } from '../../../ui-utils';
 import { settings } from '../../../settings';
-import { hasAtLeastOnePermission } from '../../../authorization';
-import { getUserPreference, RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../../../utils';
+import { hasAtLeastOnePermission, hasPermission } from '../../../authorization';
+import { getUserPreference, RoomSettingsEnum, RoomTypeConfig, RoomTypeRouteConfig, UiTextContext, roomTypes } from '../../../utils';
+import { getRoomAvatarURL } from '../../../utils/lib/getRoomAvatarURL';
 import { getAvatarURL } from '../../../utils/lib/getAvatarURL';
 
 export class NewsfeedRoomRoute extends RoomTypeRouteConfig {
@@ -43,6 +44,7 @@ export class NewsfeedRoomType extends RoomTypeConfig {
 			t: 'n',
 			name: identifier,
 		};
+
 		return ChatRoom.findOne(query);
 	}
 
@@ -53,68 +55,58 @@ export class NewsfeedRoomType extends RoomTypeConfig {
 		if (settings.get('UI_Allow_room_names_with_special_chars')) {
 			return roomData.fname || roomData.name;
 		}
+
 		return roomData.name;
 	}
 
 	condition() {
 		const groupByType = getUserPreference(Meteor.userId(), 'sidebarGroupByType');
-		return groupByType && (hasAtLeastOnePermission(['view-c-room', 'view-joined-room']) || settings.get('Accounts_AllowAnonymousRead') === true);
-	}
-
-	showJoinLink(roomId) {
-		return !!ChatRoom.findOne({ _id: roomId, t: 'n' });
-	}
-
-	includeInRoomSearch() {
-		return true;
+		return groupByType && hasPermission('view-p-room');
 	}
 
 	isGroupChat() {
 		return true;
 	}
 
 	canAddUser(room) {
-		return hasAtLeastOnePermission(['add-user-to-any-c-room', 'add-user-to-joined-room'], room._id);
+		return hasAtLeastOnePermission(['add-user-to-any-p-room', 'add-user-to-joined-room'], room._id);
 	}
 
 	canSendMessage(roomId) {
-		const room = ChatRoom.findOne({ _id: roomId, t: 'n' }, { fields: { prid: 1 } });
-		if (room.prid) {
-			return true;
-		}
-
 		// TODO: remove duplicated code
 		return ChatSubscription.find({
 			rid: roomId,
 		}).count() > 0;
 	}
 
-	enableMembersListProfile() {
-		return true;
-	}
-
 	allowRoomSettingChange(room, setting) {
 		switch (setting) {
+			case RoomSettingsEnum.JOIN_CODE:
+				return false;
 			case RoomSettingsEnum.BROADCAST:
 				return room.broadcast;
 			case RoomSettingsEnum.READ_ONLY:
 				return !room.broadcast;
 			case RoomSettingsEnum.REACT_WHEN_READ_ONLY:
 				return !room.broadcast && room.ro;
-			case RoomSettingsEnum.E2E:
-				return false;
 			case RoomSettingsEnum.SYSTEM_MESSAGES:
+			case RoomSettingsEnum.E2E:
+				return settings.get('E2E_Enable') === true;
 			default:
 				return true;
 		}
 	}
 
+	enableMembersListProfile() {
+		return true;
+	}
+
 	getUiText(context) {
 		switch (context) {
 			case UiTextContext.HIDE_WARNING:
-				return 'Hide_Room_Warning';
+				return 'Hide_Group_Warning';
 			case UiTextContext.LEAVE_WARNING:
-				return 'Leave_Room_Warning';
+				return 'Leave_Group_Warning';
 			default:
 				return '';
 		}
@@ -123,6 +115,18 @@ export class NewsfeedRoomType extends RoomTypeConfig {
 	getAvatarPath(roomData) {
 		// TODO: change to always get avatar from _id when rooms have avatars
 
-		return getAvatarURL({ username: `@${ this.roomName(roomData) }` });
+		// if room is not a discussion, returns the avatar for its name
+		if (!roomData.prid) {
+			return getAvatarURL({ username: `@${ this.roomName(roomData) }` });
+		}
+
+		// if discussion's parent room is known, get his avatar
+		const proom = ChatRoom.findOne({ _id: roomData.prid }, { reactive: false });
+		if (proom) {
+			return roomTypes.getConfig(proom.t).getAvatarPath(proom);
+		}
+
+		// otherwise gets discussion's avatar via _id
+		return getRoomAvatarURL(roomData.prid);
 	}
 }

app/newsfeed/server/deinitialize.js

@@ -2,13 +2,15 @@
 //
 // import { settings } from '../../settings';
 import { deleteRoom } from '../../lib/server/functions';
-import { Rooms } from '../../models';
+import { Rooms, Users } from '../../models';
 
 function deinitializeNewsfeed() {
 	const roomList = Rooms.findByType('n').fetch();
 	roomList.forEach((room) => {
 		deleteRoom(room._id);
 	});
+	Users.update({}, { $unset: { followers: 1 } }, { multi: true });
+	Users.update({}, { $unset: { following: 1 } }, { multi: true });
 }
 
 export { deinitializeNewsfeed };

app/ui-flextab/client/tabs/userActions.js

@@ -99,6 +99,19 @@ export const getActions = ({ user, directActions, hideAdminControls }) => {
 		}
 	};
 
+
+	const hasAlreadyFollowed = (username) => {
+		Meteor.call('hasAlreadyFollowed', username, function(error, result) {
+			if (error) {
+				console.log(error);
+				return false;
+			}
+			Session.set('hasFollowed', result);
+			return result;
+		});
+	};
+
+
 	const actions = [
 		{
 			icon: 'message',
@@ -111,6 +124,38 @@ export const getActions = ({ user, directActions, hideAdminControls }) => {
 			},
 		},
 
+		function() {
+			if (isSelf(this.username) || !directActions) {
+				return;
+			}
+			hasAlreadyFollowed(this.username);
+
+			if (Session.get('hasFollowed')) {
+				return {
+					icon: 'plus',
+					name: t('Unfollow'),
+					action: prevent(getUser, ({ username }) =>
+						Meteor.call('unfollowUser', username, success(() => toastr.success(TAPi18n.__('You_have_unfollowed__username_', { username }))))
+					),
+					condition() {
+						return settings.get('Newsfeed_enabled');
+					},
+				};
+			}
+
+
+			return {
+				icon: 'plus',
+				name: t('Follow'),
+				action: prevent(getUser, ({ username }) =>
+					Meteor.call('followUser', username, success(() => toastr.success(TAPi18n.__('You_have_followed__username_', { username }))))
+				),
+				condition() {
+					return settings.get('Newsfeed_enabled');
+				},
+			};
+		},
+
 		function() {
 			if (isSelf(this.username) || !directActions) {
 				return;

client/importPackages.js

@@ -109,3 +109,4 @@ import '../app/action-links';
 import '../app/reactions/client';
 import '../app/livechat/client';
 import '../app/newsfeed/client';
+import '../app/follow/client';

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -2969,6 +2969,7 @@
   "unarchive-room_description": "Permission to unarchive channels",
   "Unblock_User": "Unblock User",
   "Unfavorite": "Unfavorite",
+  "Unfollow": "Unfollow",
   "Unfollow_message": "Unfollow message",
   "Unignore": "Unignore",
   "Uninstall": "Uninstall",
@@ -3231,10 +3232,12 @@
   "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "You can use webhooks to easily integrate livechat with your CRM.",
   "You_cant_leave_a_livechat_room_Please_use_the_close_button": "You can't leave a livechat room. Please, use the close button.",
   "You_have_been_muted": "You have been muted and cannot speak in this room",
+  "You_have_followed__username_": "You have followed __username__",
   "You_have_n_codes_remaining": "You have __number__ codes remaining.",
   "You_have_not_verified_your_email": "You have not verified your email.",
   "You_have_successfully_unsubscribed": "You have successfully unsubscribed from our Mailling List.",
   "You_have_to_set_an_API_token_first_in_order_to_use_the_integration": "You have to set an API token first in order to use the integration.",
+  "You_have_unfollowed__username_": "You have unfollowed __username__",
   "You_must_join_to_view_messages_in_this_channel": "You must join to view messages in this channel",
   "You_need_confirm_email": "You need to confirm your email to login!",
   "You_need_install_an_extension_to_allow_screen_sharing": "You need install an extension to allow screen sharing",

server/importPackages.js

@@ -117,3 +117,4 @@ import '../app/action-links';
 import '../app/reactions/server';
 import '../app/livechat/server';
 import '../app/newsfeed/server';
+import '../app/follow/server';

server/main.js

@@ -26,12 +26,14 @@ import './methods/createDirectMessage';
 import './methods/deleteFileMessage';
 import './methods/deleteUser';
 import './methods/eraseRoom';
+import './methods/followUser';
 import './methods/getAvatarSuggestion';
 import './methods/getRoomById';
 import './methods/getRoomIdByNameOrId';
 import './methods/getRoomNameById';
 import './methods/getTotalChannels';
 import './methods/getUsersOfRoom';
+import './methods/hasAlreadyFollowed';
 import './methods/hideRoom';
 import './methods/ignoreUser';
 import './methods/loadHistory';
@@ -62,6 +64,7 @@ import './methods/setAvatarFromService';
 import './methods/setUserActiveStatus';
 import './methods/setUserPassword';
 import './methods/toogleFavorite';
+import './methods/unfollowUser';
 import './methods/unmuteUserInRoom';
 import './methods/userSetUtcOffset';
 import './publications/activeUsers';

server/methods/followUser.js

@@ -0,0 +1,43 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Users } from '../../app/models';
+import { settings } from '../../app/settings';
+
+
+Meteor.methods({
+	followUser(username) {
+		if (settings.get('Newsfeed_enabled')) {
+			// Update followers keys
+			let userObject = Users.findOneByUsername(username);
+			if ('followers' in userObject) {
+				const followersObject = userObject.followers;
+				const { _id } = Users.findOneByUsername(Meteor.user().username);
+				followersObject[_id] = '';
+				Users.update(userObject._id, { $set: { followers: followersObject } });
+			} else {
+				const followersObject = new Object();
+				const { _id } = Users.findOneByUsername(Meteor.user().username);
+				followersObject[_id] = '';
+				Users.update(userObject._id, { $set: { followers: followersObject } });
+			}
+
+			// Update following keys
+			userObject = Users.findOneByUsername(Meteor.user().username);
+			if ('following' in userObject) {
+				const followingObject = userObject.following;
+				const { _id } = Users.findOneByUsername(username);
+				followingObject[_id] = '';
+				Users.update(userObject._id, { $set: { following: followingObject } });
+			} else {
+				const followingObject = new Object();
+				const { _id } = Users.findOneByUsername(username);
+				followingObject[_id] = '';
+				Users.update(userObject._id, { $set: { following: followingObject } });
+			}
+
+			return true;
+		}
+
+		return false;
+	},
+});

server/methods/hasAlreadyFollowed.js

@@ -0,0 +1,17 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Users } from '../../app/models';
+import { settings } from '../../app/settings';
+
+Meteor.methods({
+	hasAlreadyFollowed(username) {
+		if (settings.get('Newsfeed_enabled')) {
+			if ('followers' in Users.findOneByUsername(username)) {
+				if (`${ Meteor.user()._id }` in Users.findOneByUsername(username).followers) {
+					return true;
+				}
+			}
+		}
+		return false;
+	},
+});

server/methods/unfollowUser.js

@@ -0,0 +1,33 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Users } from '../../app/models';
+import { settings } from '../../app/settings';
+
+
+Meteor.methods({
+	unfollowUser(username) {
+		if (settings.get('Newsfeed_enabled')) {
+			// Update followers keys
+			let userObject = Users.findOneByUsername(username);
+			if ('followers' in userObject) {
+				const followersObject = userObject.followers;
+				const { _id } = Users.findOneByUsername(Meteor.user().username);
+				delete followersObject[_id];
+				Users.update(userObject._id, { $set: { followers: followersObject } });
+			}
+
+			// Update following keys
+			userObject = Users.findOneByUsername(Meteor.user().username);
+			if ('following' in userObject) {
+				const followingObject = userObject.following;
+				const { _id } = Users.findOneByUsername(username);
+				delete followingObject[_id];
+				Users.update(userObject._id, { $set: { following: followingObject } });
+			}
+
+			return true;
+		}
+
+		return false;
+	},
+});