From f776cf68d68220e812d2f7c44c1dc49654d98e0b Mon Sep 17 00:00:00 2001
From: Aditya Bhardwaj <aditya.1998bhardwaj@gmail.com>
Date: Sat, 23 Mar 2019 03:06:11 +0530
Subject: [PATCH] [IMPROVE] Join channels by sending a message or join button
 (#13752)

---
 .../views/creationDialog/CreateDiscussion.js  |  1 +
 .../hooks/propagateDiscussionMetadata.js      |  1 +
 app/discussion/server/index.js                |  1 -
 app/lib/lib/roomTypes/private.js              |  5 ---
 app/ui-message/client/messageBox.html         | 30 +++++++++-------
 app/ui-message/client/messageBox.js           | 21 +++++++++--
 .../client/messageBoxNotSubscribed.html       |  9 +++--
 .../client/messageBoxNotSubscribed.js         | 36 +++++++++----------
 app/ui/client/lib/chatMessages.js             |  9 +++--
 server/startup/migrations/v139.js             |  1 +
 10 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/app/discussion/client/views/creationDialog/CreateDiscussion.js b/app/discussion/client/views/creationDialog/CreateDiscussion.js
index 7b61774ac69..48c18676f0b 100755
--- a/app/discussion/client/views/creationDialog/CreateDiscussion.js
+++ b/app/discussion/client/views/creationDialog/CreateDiscussion.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { AutoComplete } from 'meteor/mizzao:autocomplete';
diff --git a/app/discussion/server/hooks/propagateDiscussionMetadata.js b/app/discussion/server/hooks/propagateDiscussionMetadata.js
index 68e0a3d96b0..9724de1cd1d 100644
--- a/app/discussion/server/hooks/propagateDiscussionMetadata.js
+++ b/app/discussion/server/hooks/propagateDiscussionMetadata.js
@@ -1,6 +1,7 @@
 import { callbacks } from '../../../callbacks/server';
 import { Messages, Rooms } from '../../../models/server';
 import { deleteRoom } from '../../../lib/server';
+
 /**
  * We need to propagate the writing of new message in a discussion to the linking
  * system message
diff --git a/app/discussion/server/index.js b/app/discussion/server/index.js
index f16ff5ab6f0..5e8fadefa94 100644
--- a/app/discussion/server/index.js
+++ b/app/discussion/server/index.js
@@ -2,7 +2,6 @@ import './config';
 import './authorization';
 import './permissions';
 
-import './hooks/joinDiscussionOnMessage';
 import './hooks/propagateDiscussionMetadata';
 import './publications/discussionParentAutocomplete';
 import './publications/discussionsOfRoom';
diff --git a/app/lib/lib/roomTypes/private.js b/app/lib/lib/roomTypes/private.js
index 19ce495b76a..98e775423f1 100644
--- a/app/lib/lib/roomTypes/private.js
+++ b/app/lib/lib/roomTypes/private.js
@@ -70,11 +70,6 @@ export class PrivateRoomType extends RoomTypeConfig {
 	}
 
 	canSendMessage(roomId) {
-		const room = ChatRoom.findOne({ _id: roomId, t: 'p' }, { fields: { prid: 1 } });
-		if (room.prid) {
-			return true;
-		}
-
 		// TODO: remove duplicated code
 		return ChatSubscription.find({
 			rid: roomId,
diff --git a/app/ui-message/client/messageBox.html b/app/ui-message/client/messageBox.html
index 84cdef104f3..761c72ca513 100644
--- a/app/ui-message/client/messageBox.html
+++ b/app/ui-message/client/messageBox.html
@@ -1,6 +1,6 @@
 <template name="messageBox">
 	<div class="rc-message-box rc-new {{#if isEmbedded}}rc-message-box--embedded{{/if}}">
-		{{#if subscribed}}
+		{{#unless isAnonymousOrJoinCode}}
 			{{> messageBoxTyping rid=_id}}
 
 			{{#if canSend}}
@@ -25,16 +25,22 @@
 							{{> icon block="rc-input__icon-svg" icon="send"}}
 						</span>
 					{{else}}
-						{{#if isAudioMessageAllowed}}
-							{{> messageBoxAudioMessage rid=_id}}
-						{{/if}}
-						<span class="rc-message-box__action-menu" data-desktop>
-							{{#if actions}}
-								<span class="rc-message-box__icon">
-									{{> icon block="rc-input__icon-svg" icon="plus"}}
-								</span>
+						{{#if subscribed}}
+							{{#if isAudioMessageAllowed}}
+								{{> messageBoxAudioMessage rid=_id}}
 							{{/if}}
-						</span>
+							<span class="rc-message-box__action-menu" data-desktop>
+								{{#if actions}}
+									<span class="rc-message-box__icon">
+										{{> icon block="rc-input__icon-svg" icon="plus"}}
+									</span>
+								{{/if}}
+							</span>
+						{{else}}
+							<span class="rc-message-box__icon">
+								<strong><a href="#" class="js-join"> {{_"join"}}</a></strong>
+							</span>
+						{{/if}}
 					{{/unless}}
 					<span class="rc-message-box__action-label js-message-actions" data-small>
 						{{#each actions}}
@@ -75,7 +81,7 @@
 				</div>
 			{{/if}}
 		{{else}}
-			{{> messageBoxNotSubscribed rid=_id}}
-		{{/if}}
+			{{> messageBoxNotSubscribed _id=_id}}
+		{{/unless}}
 	</div>
 </template>
diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
index 805a6d8add1..ebb590cdedd 100644
--- a/app/ui-message/client/messageBox.js
+++ b/app/ui-message/client/messageBox.js
@@ -15,9 +15,10 @@ import {
 	fileUpload,
 	KonchatNotification,
 } from '../../ui';
-import { Layout, messageBox, popover, RoomManager } from '../../ui-utils';
+import { Layout, messageBox, popover, RoomManager, call } from '../../ui-utils';
 import { t, roomTypes, getUserPreference } from '../../utils';
 import moment from 'moment';
+
 import './messageBoxReplyPreview';
 import './messageBoxTyping';
 import './messageBoxAudioMessage';
@@ -253,6 +254,12 @@ Template.messageBox.helpers({
 		return Object.values(actionGroups)
 			.reduce((actions, actionGroup) => [...actions, ...actionGroup], []);
 	},
+	isAnonymousOrJoinCode() {
+		const room = Session.get(`roomData${ this._id }`);
+		return !Meteor.userId() || (!ChatSubscription.findOne({
+			rid: this._id,
+		}) && room && room.joinCodeRequired);
+	},
 	showFormattingTips() {
 		return settings.get('Message_ShowFormattingTips');
 	},
@@ -278,6 +285,16 @@ Template.messageBox.helpers({
 });
 
 Template.messageBox.events({
+	'click .js-join'(event) {
+		event.stopPropagation();
+		event.preventDefault();
+
+		const joinCodeInput = Template.instance().find('[name=joinCode]');
+		const joinCode = joinCodeInput && joinCodeInput.value;
+
+		call('joinRoom', this._id, joinCode);
+	},
+
 	'click .emoji-picker-icon'(event) {
 		event.stopPropagation();
 		event.preventDefault();
@@ -373,7 +390,7 @@ Template.messageBox.events({
 			chatMessages[this._id].valueChanged(this._id, event, Template.instance());
 		}
 	},
-	'click .js-send'(event, instance) {
+	async 'click .js-send'(event, instance) {
 		const { input } = chatMessages[RoomManager.openedRoom];
 		chatMessages[this._id].send(this._id, input, () => {
 			input.updateAutogrow();
diff --git a/app/ui-message/client/messageBoxNotSubscribed.html b/app/ui-message/client/messageBoxNotSubscribed.html
index 05da494859b..feccd6e089b 100644
--- a/app/ui-message/client/messageBoxNotSubscribed.html
+++ b/app/ui-message/client/messageBoxNotSubscribed.html
@@ -1,15 +1,14 @@
-<template name="messageBoxNotSubscribed" args="rid">
+<template name="messageBoxNotSubscribed" args="_id">
 	{{#if customTemplate}}
 		{{> Template.dynamic customTemplate }}
 	{{else}}
 		{{#if canJoinRoom}}
 			<div class="rc-message-box__join">
 				{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
-				{{#if isJoinCodeRequired}}
-					<input type="password" name="joinCode" placeholder="{{_ 'Password'}}" class="rc-input__element rc-message-box__join-code">
-				{{/if}}
 
-				<button class="rc-button rc-button--primary rc-button--small rc-message-box__join-button js-join">{{_ "join"}}</button>
+				<input type="password" name="joinCode" placeholder="{{_ 'Password'}}" class="rc-input__element rc-message-box__join-code">
+
+				<button class="rc-button rc-button--primary rc-button--small rc-message-box__join-button js-join-code">{{_ "join"}}</button>
 			</div>
 		{{/if}}
 
diff --git a/app/ui-message/client/messageBoxNotSubscribed.js b/app/ui-message/client/messageBoxNotSubscribed.js
index e9cf456d4db..f3fe690e670 100644
--- a/app/ui-message/client/messageBoxNotSubscribed.js
+++ b/app/ui-message/client/messageBoxNotSubscribed.js
@@ -2,26 +2,26 @@ import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { settings } from '../../settings';
-import { RoomHistoryManager, RoomManager, call } from '../../ui-utils';
-import { t, roomTypes } from '../../utils';
+import { call } from '../../ui-utils';
+import { roomTypes } from '../../utils';
+import { RoomManager, RoomHistoryManager } from '../../ui-utils';
 import { hasAllPermission } from '../../authorization';
-import toastr from 'toastr';
 import './messageBoxNotSubscribed.html';
 
 
 Template.messageBoxNotSubscribed.helpers({
 	customTemplate() {
-		return roomTypes.getNotSubscribedTpl(this.rid);
+		return roomTypes.getNotSubscribedTpl(this._id);
 	},
 	canJoinRoom() {
-		return Meteor.userId() && roomTypes.verifyShowJoinLink(this.rid);
+		return Meteor.userId() && roomTypes.verifyShowJoinLink(this._id);
 	},
 	roomName() {
-		const room = Session.get(`roomData${ this.rid }`);
+		const room = Session.get(`roomData${ this._id }`);
 		return roomTypes.getRoomName(room.t, room);
 	},
 	isJoinCodeRequired() {
-		const room = Session.get(`roomData${ this.rid }`);
+		const room = Session.get(`roomData${ this._id }`);
 		return room && room.joinCodeRequired;
 	},
 	isAnonymousReadAllowed() {
@@ -36,26 +36,24 @@ Template.messageBoxNotSubscribed.helpers({
 });
 
 Template.messageBoxNotSubscribed.events({
-	async 'click .js-join'(event) {
+	async 'click .js-join-code'(event) {
 		event.stopPropagation();
 		event.preventDefault();
 
 		const joinCodeInput = Template.instance().find('[name=joinCode]');
 		const joinCode = joinCodeInput && joinCodeInput.value;
 
-		try {
-			await call('joinRoom', this.rid, joinCode);
-			if (hasAllPermission('preview-c-room') === false && RoomHistoryManager.getRoom(this.rid).loaded === 0) {
-				RoomManager.getOpenedRoomByRid(this.rid).streamActive = false;
-				RoomManager.getOpenedRoomByRid(this.rid).ready = false;
-				RoomHistoryManager.getRoom(this.rid).loaded = null;
-				RoomManager.computation.invalidate();
-			}
-		} catch (error) {
-			toastr.error(t(error.reason));
+		await call('joinRoom', this._id, joinCode);
+
+		if (hasAllPermission('preview-c-room') === false && RoomHistoryManager.getRoom(this._id).loaded === 0) {
+			RoomManager.getOpenedRoomByRid(this._id).streamActive = false;
+			RoomManager.getOpenedRoomByRid(this._id).ready = false;
+			RoomHistoryManager.getRoom(this._id).loaded = null;
+			RoomManager.computation.invalidate();
 		}
-	},
 
+
+	},
 	'click .js-register'(event) {
 		event.stopPropagation();
 		event.preventDefault();
diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index 0690d225681..d55d377abc9 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -6,12 +6,12 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { t, getUserPreference, slashCommands, handleError } from '../../../utils';
-import { MessageAction, messageProperties, MessageTypes, readMessage, modal } from '../../../ui-utils';
+import { MessageAction, messageProperties, MessageTypes, readMessage, modal, call } from '../../../ui-utils';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
 import { promises } from '../../../promises';
 import { hasAtLeastOnePermission } from '../../../authorization';
-import { Messages, Rooms, ChatMessage } from '../../../models';
+import { Messages, Rooms, ChatMessage, ChatSubscription } from '../../../models';
 import { emoji } from '../../../emoji';
 import { KonchatNotification } from './notification';
 import { MsgTyping } from './msgTyping';
@@ -239,6 +239,11 @@ export const ChatMessages = class ChatMessages {
 	* * @param {function?} done callback
 	*/
 	async send(rid, input, done = function() {}) {
+
+		if (!ChatSubscription.findOne({ rid })) {
+			await call('joinRoom', rid);
+		}
+
 		if (s.trim(input.value) !== '') {
 			readMessage.enable();
 			readMessage.readNow();
diff --git a/server/startup/migrations/v139.js b/server/startup/migrations/v139.js
index 58cd2cfeafb..bb8a984902d 100644
--- a/server/startup/migrations/v139.js
+++ b/server/startup/migrations/v139.js
@@ -1,4 +1,5 @@
 import { Migrations } from '../../../app/migrations/server';
+
 import { Messages, Permissions, Rooms, Settings } from '../../../app/models/server';
 
 const getField = (msg, fieldType, fieldName) => {