Rename Threads to Discussion

app/message-attachments/client/messageAttachment.html

@@ -6,7 +6,7 @@
 		{{else}}
 			{{pretext}}
 		{{/if}}
-		<div class="attachment-block">
+		<div class="color-primary-font-color attachment-block">
 			<div class="attachment-block-border background-info-font-color" style="background-color: {{color}}"></div>
 			{{#if author_name}}
 				{{#if author_link}}

app/theme/client/imports/components/header.css

@@ -10,6 +10,8 @@
 
 		padding: 0 0.25rem;
 
+		cursor: pointer;
+
 		justify-content: center;
 	}
 

app/theme/client/imports/components/modal/create-channel.css

@@ -24,8 +24,8 @@
 	}
 
 	&__switches,
-	&__inputs:not(:only-child),
-	& .rc-input:not(:only-child) {
+	&__inputs:not(:only-of-type),
+	& .rc-input:not(:only-of-type) {
 		margin-bottom: var(--create-channel-gap-between-elements);
 	}
 

app/threading/server/methods/createThread.js

@@ -18,6 +18,11 @@ const fields = [
 	},
 ];
 
+const getParentRoom = (rid) => {
+	const room = Rooms.findOne(rid);
+	return room && (room.prid ? Rooms.findOne(room.prid, { fields: { _id: 1 } }) : room);
+};
+
 export const createThreadMessage = (rid, user, trid, msg, message_embedded) => {
 	const welcomeMessage = {
 		msg,
@@ -47,7 +52,7 @@ export const create = ({ prid, pmid, t_name, reply, users }) => {
 	if (pmid) {
 		message = Messages.findOne({ _id: pmid });
 		if (prid) {
-			if (prid !== message.rid) {
+			if (prid !== getParentRoom(message.rid)._id) {
 				throw new Meteor.Error('error-invalid-arguments', { method: 'ThreadCreation' });
 			}
 		} else {
@@ -58,6 +63,7 @@ export const create = ({ prid, pmid, t_name, reply, users }) => {
 	if (!prid) {
 		throw new Meteor.Error('error-invalid-arguments', { method: 'ThreadCreation' });
 	}
+
 	const p_room = Rooms.findOne(prid);
 
 	if (p_room.prid) {
@@ -110,7 +116,7 @@ export const create = ({ prid, pmid, t_name, reply, users }) => {
 			trid: thread._id,
 		});
 
-		mentionThreadMessage(thread._id, user, reply, attachMessage(message, p_room));
+		mentionThreadMessage(thread._id, user, t_name, attachMessage(message, p_room));
 
 		// check if the message is in the latest 10 messages sent to the room
 		// if not creates a new message saying about the thread creation
@@ -125,13 +131,13 @@ export const create = ({ prid, pmid, t_name, reply, users }) => {
 		}).fetch();
 
 		if (!lastMessageIds.find((msg) => msg._id === message._id)) {
-			createThreadMessage(message.rid, user, thread._id, reply, attachMessage(message, p_room));
+			createThreadMessage(message.rid, user, thread._id, t_name, attachMessage(message, p_room));
 		}
 	} else {
-		createThreadMessage(prid, user, thread._id, reply);
-		if (reply) {
-			sendMessage(user, { msg: reply }, thread);
-		}
+		createThreadMessage(prid, user, thread._id, t_name);
+	}
+	if (reply) {
+		sendMessage(user, { msg: reply }, thread);
 	}
 	return thread;
 };

app/ui-message/client/message.html

@@ -58,7 +58,7 @@
 		{{#if isIgnored}}
 			<span class="toggle-hidden icon-right-dir" data-message="{{_id}}"> {{_ "Message_Ignored"}} </span>
 		{{/if}}
-		<div class="body color-primary-font-color {{system true}}" dir="auto" data-unread-text="{{_ "Unread_Messages"}}">
+		<div class="body {{bodyClass}}" dir="auto" data-unread-text="{{_ "Unread_Messages"}}">
 			{{#if isSnippet}}
 				<div class="snippet-name">{{_ "Snippet_name"}}: {{snippetName}}</div>
 			{{/if}}

app/ui-message/client/message.js

@@ -177,6 +177,9 @@ Template.message.helpers({
 	body() {
 		return Template.instance().body;
 	},
+	bodyClass() {
+		return MessageTypes.isSystemMessage(this) ? 'color-info-font-color' : 'color-primary-font-color';
+	},
 	system(returnClass) {
 		if (MessageTypes.isSystemMessage(this)) {
 			if (returnClass) {

app/ui-sidenav/client/sortlist.html

@@ -22,6 +22,15 @@
 		</ul>
 		<span class="rc-popover__divider"></span>
 		<ul class="rc-popover__list">
+			<li class="rc-popover__item {{bold 'sidebarShowThreads'}}">
+				<label class="rc-popover__label">
+					<input type="checkbox" name="sidebarShowThreads" class="hidden" checked="{{checked 'sidebarShowThreads'}}" />
+					<span class="rc-popover__icon">
+						{{> icon block="rc-popover__icon-element" icon='thread' }}
+					</span>
+					<span class="rc-popover__item-text">{{_ "Threads_in_sidebar"}}</span>
+				</label>
+			</li>
 			<li class="rc-popover__item {{bold 'sidebarGroupByType'}}">
 				<label class="rc-popover__label">
 					<input type="checkbox" name="sidebarGroupByType" class="hidden" checked="{{checked 'sidebarGroupByType'}}"/>

app/ui-sidenav/client/sortlist.js

@@ -6,6 +6,10 @@ import { settings } from '../../settings';
 
 const checked = function(prop, field) {
 	const userId = Meteor.userId();
+
+	if (prop === 'sidebarShowThreads') {
+		return getUserPreference(userId, 'sidebarShowThreads');
+	}
 	if (prop === 'sidebarShowFavorites') {
 		return getUserPreference(userId, 'sidebarShowFavorites');
 	}

app/ui-utils/client/lib/modal.html

@@ -51,10 +51,12 @@ <h1 class="rc-modal__title">
 						</label>
 					{{/if}}
 					</section>
-					<footer class="rc-modal__footer {{#unless showFooter}}rc-modal__footer--empty{{/unless}}">
-						<input class="rc-button rc-button--nude js-close {{#unless showCancelButton}}rc-button--invisible{{/unless}}" type="submit" data-button="cancel" value="{{cancelButtonText}}">
-						<input style="background-color:{{confirmButtonColor}}" class="rc-button rc-button--primary js-confirm {{#unless showConfirmButton}}rc-button--invisible{{/unless}}" type="submit" data-button="create" value="{{confirmButtonText}}">
-					</footer>
+					{{# if showFooter }}
+						<footer class="rc-modal__footer {{#unless showFooter}}rc-modal__footer--empty{{/unless}}">
+							<input class="rc-button rc-button--nude js-close {{#unless showCancelButton}}rc-button--invisible{{/unless}}" type="submit" data-button="cancel" value="{{cancelButtonText}}">
+							<input style="background-color:{{confirmButtonColor}}" class="rc-button rc-button--primary js-confirm {{#unless showConfirmButton}}rc-button--invisible{{/unless}}" type="submit" data-button="create" value="{{confirmButtonText}}">
+						</footer>
+					{{/if}}
 			{{/if}}
 			</dialog>
 	</div>

app/ui-utils/client/lib/modal.js

@@ -93,6 +93,11 @@ export const modal = {
 };
 
 Template.rc_modal.helpers({
+
+	showFooter() {
+		const { showCancelButton, showConfirmButton } = this;
+		return showCancelButton || showConfirmButton;
+	},
 	hasAction() {
 		return !!this.action;
 	},