From 1a32a43eb557b2ba5061ca05857cc8fa97743232 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Fri, 24 Nov 2017 10:53:53 -0200
Subject: [PATCH] Unpin and Unstar labels

---
 app/containers/MessageActions.js | 5 +++--
 app/lib/rocketchat.js            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/containers/MessageActions.js b/app/containers/MessageActions.js
index ba6aa5e34..0dbe258e7 100644
--- a/app/containers/MessageActions.js
+++ b/app/containers/MessageActions.js
@@ -88,6 +88,7 @@ export default class MessageActions extends React.Component {
 
 	async componentWillReceiveProps(nextProps) {
 		if (nextProps.showActions !== this.props.showActions && nextProps.showActions) {
+			const { actionMessage } = nextProps;
 			// Cancel
 			this.options = ['Cancel'];
 			this.CANCEL_INDEX = 0;
@@ -110,12 +111,12 @@ export default class MessageActions extends React.Component {
 			this.QUOTE_INDEX = this.options.length - 1;
 			// Star
 			if (this.props.Message_AllowStarring) {
-				this.options.push('Star');
+				this.options.push(actionMessage.starred ? 'Unstar' : 'Star');
 				this.STAR_INDEX = this.options.length - 1;
 			}
 			// Pin
 			if (this.props.Message_AllowPinning) {
-				this.options.push('Pin');
+				this.options.push(actionMessage.pinned ? 'Unpin' : 'Pin');
 				this.PIN_INDEX = this.options.length - 1;
 			}
 			// Delete
diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 30090f8d8..4bebee727 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -70,7 +70,7 @@ const RocketChat = {
 							message.temp = false;
 							message._server = server;
 							message.attachments = message.attachments || [];
-							message.starred = !!message.starred;
+							message.starred = message.starred && message.starred.length > 0;
 							realm.create('messages', message, true);
 						});
 					}