[NEW] Heavy weight threading (now called Discussions)- with minor model impact

packages/assistify-threading/auth.js

@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Permissions } from 'meteor/rocketchat:models';
 
 Meteor.startup(() => {
 
@@ -10,8 +10,8 @@ Meteor.startup(() => {
 	];
 
 	for (const permission of permissions) {
-		if (!RocketChat.models.Permissions.findOneById(permission._id)) {
-			RocketChat.models.Permissions.upsert(permission._id, { $set: permission });
+		if (!Permissions.findOneById(permission._id)) {
+			Permissions.upsert(permission._id, { $set: permission });
 		}
 	}
 });

packages/assistify-threading/authorization.js

@@ -0,0 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+import { addRoomAccessValidator, canAccessRoom } from 'meteor/rocketchat:authorization';
+import { Rooms } from 'meteor/rocketchat:models';
+
+Meteor.startup(() => {
+	addRoomAccessValidator(function(room, user) {
+		return room.prid && canAccessRoom(Rooms.findOne(room.prid), user);
+	});
+});

packages/assistify-threading/config.js

@@ -1,76 +1,58 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
-
-function getParentChannels() {
-	const result = Meteor.call('getParentChannelList', { sort: 'name', default: -1 });
-
-	return result.channels
-		.filter((channel) => !!channel.name)
-		.map((channel) => ({
-			key: channel.name, // has to be "key" in order to be able to select it in the settings as dropdown
-			i18nLabel: channel.name,
-		}));
-}
+import { settings } from 'meteor/rocketchat:settings';
 
 Meteor.startup(() => {
-	RocketChat.settings.addGroup('Threading');
-
-	// the channel for which threads are created if none is explicitly chosen
-	let defaultChannel = '';
-
-	const generalChannel = RocketChat.models.Rooms.findOneById('GENERAL');
-
-	if (generalChannel) {
-		defaultChannel = generalChannel.name;
-	} else {
-		const potentialParentChannels = getParentChannels();
-		defaultChannel = potentialParentChannels[0] ? potentialParentChannels[0].key : '';
-	}
-	RocketChat.settings.add('Thread_default_parent_Channel', defaultChannel, {
-		group: 'Threading',
-		i18nLabel: 'Thread_default_parent_Channel',
-		type: 'string',
-		public: true,
-	});
-
-	// Set the default channel on each restart if unset
-	if (!RocketChat.settings.get('Thread_default_parent_Channel')) {
-		RocketChat.models.Settings.updateValueById('Thread_default_parent_Channel', defaultChannel);
-	}
-
-	RocketChat.settings.add('Thread_invitations_threshold', 10, {
-		group: 'Threading',
-		i18nLabel: 'Thread_invitations_threshold',
-		i18nDescription: 'Thread_invitations_threshold_description',
-		type: 'int',
-		public: true,
-	});
-
-	RocketChat.settings.add('Thread_from_context_menu', 'button', {
-		group: 'Threading',
-		i18nLabel: 'Thread_from_context_menu',
-		type: 'select',
-		values: [
-			{ key: 'button', i18nLabel: 'Threading_context_menu_button' },
-			{ key: 'none', i18nLabel: 'Threading_context_menu_none' },
-		],
-		public: true,
-	});
-
-	RocketChat.settings.add('Accounts_Default_User_Preferences_sidebarShowThreads', true, {
-		group: 'Accounts',
-		section: 'Accounts_Default_User_Preferences',
-		type: 'boolean',
-		public: true,
-		i18nLabel: 'Threads_in_sidebar',
-	});
-
-	// this is a technical counter which allows for generation of unique room names
-	RocketChat.settings.add('Thread_Count', 1, {
-		group: 'Threading',
-		i18nLabel: 'Thread_count',
-		type: 'int',
-		public: false,
-		hidden: true,
+	settings.addGroup('Threading', function() {
+		// the channel for which threads are created if none is explicitly chosen
+		this.add('Thread_invitations_threshold', 10, {
+			group: 'Threading',
+			i18nLabel: 'Thread_invitations_threshold',
+			i18nDescription: 'Thread_invitations_threshold_description',
+			type: 'int',
+			public: true,
+		});
+
+		this.add('Thread_from_context_menu', 'button', {
+			group: 'Threading',
+			i18nLabel: 'Thread_from_context_menu',
+			type: 'select',
+			values: [
+				{ key: 'button', i18nLabel: 'Threading_context_menu_button' },
+				{ key: 'none', i18nLabel: 'Threading_context_menu_none' },
+			],
+			public: true,
+		});
+
+		this.add('Accounts_Default_User_Preferences_sidebarShowThreads', true, {
+			group: 'Accounts',
+			section: 'Accounts_Default_User_Preferences',
+			type: 'boolean',
+			public: true,
+			i18nLabel: 'Threads_in_sidebar',
+		});
+
+		// this is a technical counter which allows for generation of unique room names
+		this.add('Thread_Count', 1, {
+			group: 'Threading',
+			i18nLabel: 'Thread_count',
+			type: 'int',
+			public: false,
+			hidden: true,
+		});
+
+
+		const globalQuery = {
+			_id: 'RetentionPolicy_Enabled',
+			value: true,
+		};
+
+		this.add('RetentionPolicy_ExcludeThreads', false, {
+			group:'RetentionPolicy',
+			type: 'boolean',
+			public: true,
+			i18nLabel: 'RetentionPolicy_ExcludeThreads',
+			i18nDescription: 'RetentionPolicy_ExcludeThreads_Description',
+			enableQuery: globalQuery,
+		});
 	});
 });

packages/assistify-threading/lib/messageTypes/threadMessage.js

@@ -1,10 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat } from 'meteor/rocketchat:lib';
-
+import { MessageTypes } from 'meteor/rocketchat:ui-utils';
 
 Meteor.startup(function() {
-	RocketChat.MessageTypes.registerType({
+	MessageTypes.registerType({
 		id: 'create-thread',
 		system: true,
 		message: 'thread-created',
@@ -17,7 +16,7 @@ Meteor.startup(function() {
 		},
 	});
 
-	RocketChat.MessageTypes.registerType({
+	MessageTypes.registerType({
 		id: 'thread-welcome',
 		system: true,
 		message: 'thread-welcome',
@@ -31,4 +30,3 @@ Meteor.startup(function() {
 		},
 	});
 });
-

packages/assistify-threading/lib/threadRoomType.js

@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
-import { RocketChat, RoomTypeConfig } from 'meteor/rocketchat:lib';
-
+import { RocketChat } from 'meteor/rocketchat:lib';
+import { RoomTypeConfig, roomTypes } from 'meteor/rocketchat:utils';
 export class ThreadRoomType extends RoomTypeConfig {
 	constructor() {
 		super({
@@ -18,4 +18,4 @@ export class ThreadRoomType extends RoomTypeConfig {
 	}
 }
 
-RocketChat.roomTypes.add(new ThreadRoomType());
+roomTypes.add(new ThreadRoomType());

packages/assistify-threading/server/hooks/propagateThreadMetadata.js

@@ -1,12 +1,13 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
 
+import { callbacks } from 'meteor/rocketchat:callbacks';
+import { Messages } from 'meteor/rocketchat:models';
 /**
  * We need to propagate the writing of new message in a thread to the linking
  * system message
  */
-RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
+callbacks.add('afterSaveMessage', function(message, room) {
 	if (room.linkMessageId) {
-		RocketChat.models.Messages.refreshThreadMetadata(room.linkMessageId);
+		Messages.refreshThreadMetadata(room.linkMessageId);
 	}
 	return message;
-}, RocketChat.callbacks.priority.LOW, 'PropagateThreadMetadata');
+}, callbacks.priority.LOW, 'PropagateThreadMetadata');

packages/assistify-threading/server/methods/getParentChannelId.js

@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { Rooms } from 'meteor/rocketchat:models';
 Meteor.methods({
+
 	'assistify:getParentChannelId'(channelName) {
 		check(channelName, String);
 

packages/assistify-threading/server/methods/getParentChannelList.js

@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { Rooms } from 'meteor/rocketchat:models';
-import { hasPermission } from 'meteor/rocketchat:authorization';
+import { hasPermission } from 'meteor/rocketchat:authorization';
+
 Meteor.methods({
 	'getParentChannelList'({ sort, limit }) {
 		this.unblock();

packages/assistify-threading/server/models/MessagesExtension.js

@@ -1,4 +1,4 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Messages, Rooms } from 'meteor/rocketchat:models';
 
 /**
  * Copy metadata from the thread to the system message in the parent channel
@@ -7,12 +7,12 @@ import { RocketChat } from 'meteor/rocketchat:lib';
  * to race conditions: If multiple updates occur, the current state will be updated
  * only if the new state of the thread room is really newer.
  */
-Object.assign(RocketChat.models.Messages, {
+Object.assign(Messages, {
 	refreshThreadMetadata(linkMessageId) {
 		const linkMessage = this.findOneById(linkMessageId);
 
 		if (linkMessage && linkMessage.channels[0] && linkMessage.channels[0]._id) {
-			const threadRoom = RocketChat.models.Rooms.findOneById(linkMessage.channels[0]._id);
+			const threadRoom = Rooms.findOneById(linkMessage.channels[0]._id);
 			const query = {
 				_id: linkMessageId,
 				_updatedAt: {

packages/assistify-threading/server/models/RoomsExtension.js

@@ -1,8 +1,8 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Rooms } from 'meteor/rocketchat:models';
 
 import s from 'underscore.string';
 
-Object.assign(RocketChat.models.Rooms, {
+Object.assign(Rooms, {
 	findThreadParentByNameStarting(name, options) {
 		const nameRegex = new RegExp(`^${ s.trim(s.escapeRegExp(name)) }`, 'i');
 

packages/assistify-threading/server/publications/threadParentAutocomplete.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Rooms } from 'meteor/rocketchat:models';
-import { hasPermission } from 'meteor/rocketchat:authorization';
+
+import { hasPermission } from 'meteor/rocketchat:authorization';
 
 Meteor.publish('threadParentAutocomplete', function(selector) {
 	if (!this.userId) {