[WIP] threads review/adjustments

.meteor/packages

@@ -118,7 +118,6 @@ rocketchat:slackbridge
 rocketchat:slashcommands-archive
 rocketchat:slashcommands-asciiarts
 rocketchat:slashcommands-create
-rocketchat:slashcommands-create-thread
 rocketchat:slashcommands-help
 rocketchat:slashcommands-hide
 rocketchat:slashcommands-invite

.meteor/versions

@@ -195,7 +195,6 @@ rocketchat:mailer@0.0.1
 rocketchat:mailmessages@0.0.1
 rocketchat:mapview@0.0.1
 rocketchat:markdown@0.0.2
-rocketchat:metrics@0.0.1
 rocketchat:mentions@0.0.1
 rocketchat:mentions-flextab@0.0.1
 rocketchat:message-action@0.0.1
@@ -204,6 +203,7 @@ rocketchat:message-mark-as-unread@0.0.1
 rocketchat:message-pin@0.0.1
 rocketchat:message-snippet@0.0.1
 rocketchat:message-star@0.0.1
+rocketchat:metrics@0.0.1
 rocketchat:migrations@0.0.1
 rocketchat:models@1.0.0
 rocketchat:monitoring@2.30.2_3
@@ -226,7 +226,6 @@ rocketchat:slackbridge@0.0.1
 rocketchat:slashcommands-archive@0.0.1
 rocketchat:slashcommands-asciiarts@0.0.1
 rocketchat:slashcommands-create@0.0.1
-rocketchat:slashcommands-create-thread@0.0.1
 rocketchat:slashcommands-help@0.0.1
 rocketchat:slashcommands-hide@0.0.1
 rocketchat:slashcommands-invite@0.0.1

packages/assistify-threading/client/createThreadMessageAction.js

@@ -1,48 +1,37 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import { RocketChat } from 'meteor/rocketchat:lib';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Tracker } from 'meteor/tracker';
-import { ChatMessage } from 'meteor/rocketchat:models';
+import { call } from 'meteor/rocketchat:lib';
+
+const condition = (rid, uid) => {
+	if (!RocketChat.models.Subscriptions.findOne({ rid })) {
+		return false;
+	}
+	return uid !== Meteor.userId() ? RocketChat.authz.hasPermission('start-thread-other-user') : RocketChat.authz.hasPermission('start-thread');
+};
 
 Meteor.startup(function() {
-	const instance = this;
-	instance.room = new ReactiveVar('');
-	RocketChat.MessageAction.addButton({
-		id: 'start-thread',
-		icon: 'thread',
-		label: 'Thread_start',
-		context: ['message', 'message-mobile'],
-		action() {
-			const message = this._arguments[1];
-			Meteor.call('createThreadFromMessage', message, function(error, result) {
-				if (result) {
-					// remove the hidden message from the UI - the message list is not reactive
-					Tracker.nonreactive(function() {
-						ChatMessage.remove({
-							_id: message._id,
-						});
-					});
+	Tracker.autorun(() => {
+		if (RocketChat.settings.get('Thread_from_context_menu') !== 'button') {
+			return RocketChat.MessageAction.removeButton('start-thread');
+		}
 
-					// navigate to the newly created room
-					FlowRouter.goToRoomById(result._id);
-				}
-			});
-		},
-		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
-				return false;
-			}
-			if (RocketChat.settings.get('Thread_from_context_menu') !== 'button') {
-				return false;
-			}
-			if (message.u._id !== Meteor.userId()) {
-				return RocketChat.authz.hasAtLeastOnePermission('start-thread-other-user');
-			} else {
-				return RocketChat.authz.hasAtLeastOnePermission('start-thread');
-			}
-		},
-		order: 0,
-		group: 'menu',
+		RocketChat.MessageAction.addButton({
+			id: 'start-thread',
+			icon: 'thread',
+			label: 'Thread_start',
+			context: ['message', 'message-mobile'],
+			async action() {
+				const [, message] = this._arguments;
+				const { _id } = await call('createThreadFromMessage', message);
+				FlowRouter.goToRoomById(_id);
+			},
+			condition({ rid, u: { _id: uid } }) {
+				return condition(rid, uid);
+			},
+			order: 0,
+			group: 'menu',
+		});
 	});
 });

packages/assistify-threading/client/threadFromMessageBox.js

@@ -1,11 +1,21 @@
+import { Meteor } from 'meteor/meteor';
 import { RocketChat } from 'meteor/rocketchat:lib';
 import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Tracker } from 'meteor/tracker';
 
-RocketChat.messageBox.actions.add('Create_new', 'Thread', {
-	id: 'start-thread',
-	icon: 'thread',
-	condition: () => (navigator.getUserMedia || navigator.webkitGetUserMedia) && RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_VideoRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList') || RocketChat.settings.get('FileUpload_MediaTypeWhiteList').match(/video\/webm|video\/\*/i)),
-	action() {
-		return FlowRouter.go('create-thread');
-	},
+Meteor.startup(function() {
+	Tracker.autorun(() => {
+		if (RocketChat.settings.get('Thread_from_context_menu') !== 'button') {
+			return RocketChat.messageBox.actions.remove('Create_new');
+		}
+		RocketChat.messageBox.actions.add('Create_new', 'Thread', {
+			id: 'start-thread',
+			icon: 'thread',
+			condition: () => true,
+			action() {
+				return FlowRouter.go('create-thread');
+			},
+		});
+
+	});
 });

packages/rocketchat-ui-sidenav/client/sideNav.html

@@ -2,9 +2,6 @@
 		<aside class="sidebar sidebar--{{sidebarViewMode}} {{#if sidebarHideAvatar}}sidebar--hide-avatar{{/if}}" role="navigation">
 			{{> sidebarHeader }}
 			{{#if loggedInUser}}
-				{{#if threadingFromSidebar}}
-					<button class="create-thread-sidebar-button rc-button rc-button--primary js-create-thread">{{> icon icon="plus"}} {{_ "Thread_start"}}</button>
-				{{/if}}
 				<div class="unread-rooms background-primary-action-color color-primary-action-contrast top-unread-rooms hidden">
 					{{_ "More_unreads"}} <i class="icon-up-big"></i>
 				</div>

packages/rocketchat-ui-sidenav/client/sideNav.js

@@ -21,10 +21,6 @@ Template.sideNav.helpers({
 		return String(settings.get('Layout_Sidenav_Footer')).trim();
 	},
 
-	threadingFromSidebar() {
-		return RocketChat.authz.hasPermission('start-thread') && RocketChat.getUserPreference(Meteor.userId(), 'sidebarShowThreads') && !Meteor.isCordova;
-	},
-
 	roomType() {
 		return roomTypes.getTypes().map((roomType) => ({
 			template: roomType.customTemplate || 'roomList',
@@ -68,10 +64,6 @@ Template.sideNav.events({
 	'dropped .sidebar'(e) {
 		return e.preventDefault();
 	},
-
-	'click .js-create-thread'() {
-		return FlowRouter.go('create-thread');
-	},
 });
 
 Template.sideNav.onRendered(function() {