Merge remote-tracking branch 'origin/develop' into improvements/outgoing-hooks

.gitignore

@@ -66,3 +66,4 @@ tramp
 ecosystem.json
 pm2.json
 settings.json
+build.sh

.meteor/packages

@@ -41,6 +41,7 @@ rocketchat:lib
 rocketchat:authorization
 rocketchat:autolinker
 rocketchat:channel-settings
+rocketchat:channel-settings-mail-messages
 rocketchat:colors
 rocketchat:custom-oauth
 rocketchat:emojione

.meteor/versions

@@ -7,7 +7,7 @@ accounts-oauth@1.1.8
 accounts-password@1.1.4
 accounts-twitter@1.0.6
 alanning:roles@1.2.14
-aldeed:simple-schema@1.5.1
+aldeed:simple-schema@1.5.2
 arunoda:streams@0.1.17
 autoupdate@1.2.4
 babel-compiler@5.8.24_1
@@ -25,7 +25,7 @@ cfs:http-methods@0.0.30
 check@1.1.0
 chrismbeckett:toastr@2.1.2_1
 coffeescript@1.0.11
-cosmos:browserify@0.9.2
+cosmos:browserify@0.9.3
 dandv:caret-position@2.1.1
 ddp@1.2.2
 ddp-client@1.2.1
@@ -39,7 +39,7 @@ ecmascript@0.1.6
 ecmascript-runtime@0.2.6
 ejson@1.0.7
 email@1.0.8
-emojione:emojione@1.5.2
+emojione:emojione@2.0.0
 facebook@1.2.2
 fastclick@1.0.7
 francocatena:status@1.5.0
@@ -75,7 +75,7 @@ livedata@1.0.15
 localstorage@1.0.5
 logging@1.0.8
 matb33:collection-hooks@0.8.1
-mdg:validation-error@0.1.0
+mdg:validation-error@0.2.0
 meteor@1.1.10
 meteor-base@1.0.1
 meteor-developer@1.1.5
@@ -125,6 +125,7 @@ rocketchat:assets@0.0.1
 rocketchat:authorization@0.0.1
 rocketchat:autolinker@0.0.1
 rocketchat:channel-settings@0.0.1
+rocketchat:channel-settings-mail-messages@0.0.1
 rocketchat:colors@0.0.1
 rocketchat:cors@0.0.1
 rocketchat:custom-oauth@1.0.0

.sandstorm/sandstorm-pkgdef.capnp

@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
     appVersion = 6,  # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "0.10.1"),
+    appMarketingVersion = (defaultText = "0.10.2"),
     # Human-readable representation of appVersion. Should match the way you
     # identify versions of your app in documentation and marketing.
 

i18n/en.i18n.json

@@ -76,6 +76,7 @@
   "API_Embed" : "Embed",
   "API_EmbedDisabledFor" : "Disable Embed for Users",
   "API_EmbedDisabledFor_Description" : "Comma-separated list of usernames",
+  "Archive" : "Archive",
   "are_also_typing" : "are also typing",
   "are_typing" : "are typing",
   "Are_you_sure" : "Are you sure?",
@@ -139,6 +140,8 @@
   "Disable_New_Room_Notification" : "Disable New Room Notification",
   "Do_you_want_to_change_to_s_question" : "Do you want to change to <strong>%s</strong>?",
   "Drop_to_upload_file" : "Drop to upload file",
+  "Duplicate_archived_channel_name" : "An archived Channel with name '%s' exists",
+  "Duplicate_archived_private_group_name" : "An archived Private Group with name '%s' exists",
   "Duplicate_channel_name" : "A Channel with name '%s' exists",
   "Duplicate_private_group_name" : "A Private Group with name '%s' exists",
   "E-mail" : "E-mail",
@@ -217,8 +220,8 @@
   "italics" : "italics",
   "join" : "Join",
   "Join_the_Community" : "Join the Community",
-  "Jump_to_recent_messages" : "Jump to recent messages",
   "Jump_to_message" : "Jump to message",
+  "Jump_to_recent_messages" : "Jump to recent messages",
   "Language" : "Language",
   "Language_Version" : "English Version",
   "Last_login" : "Last login",
@@ -383,10 +386,12 @@
   "Restart" : "Restart",
   "Restart_the_server" : "Restart the server",
   "Room" : "Room",
+  "Room_archived" : "Room archived",
   "Room_has_been_deleted" : "Room has been deleted",
   "Room_name_changed" : "Room name changed to: <em>__room_name__</em> by <em>__user_by__</em>",
   "Room_name_changed_successfully" : "Room name changed successfully",
   "Room_not_found" : "Room not found",
+  "Room_unarchived" : "Room unarchived",
   "Room_uploaded_file_list" : "Files List",
   "Room_uploaded_file_list_empty" : "No files available.",
   "room_user_count" : "%s users",
@@ -426,6 +431,7 @@
   "Settings_updated" : "Settings updated",
   "Should_be_a_URL_of_an_image" : "Should be a URL of an image.",
   "Should_exists_a_user_with_this_username" : "The user must already exist.",
+  "Showing_archived_results" : "<p>Showing <b>%s</b> archived results</p>",
   "Showing_online_users" : "Showing <b>__total_online__</b> of __total__ users",
   "Showing_results" : "<p>Showing <b>%s</b> results</p>",
   "Silence" : "Silence",
@@ -477,6 +483,7 @@
   "There_is_no_integrations" : "There is no integrations",
   "This_is_a_push_test_messsage" : "This is a push test messsage",
   "True" : "True",
+  "Unarchive" : "Unarchive",
   "Unmute_user" : "Unmute user",
   "Unnamed" : "Unnamed",
   "Unread_Rooms" : "Unread Rooms",
@@ -548,4 +555,4 @@
   "Your_entry_has_been_deleted" : "Your entry has been deleted.",
   "Your_Open_Source_solution" : "Your own Open Source chat solution",
   "Your_push_was_sent_to_s_devices" : "Your push was sent to %s devices"
-}
+}
\ No newline at end of file

packages/rocketchat-authorization/server/startup.coffee

@@ -27,6 +27,9 @@ Meteor.startup ->
 		{ _id: 'edit-other-user-info',
 		roles : ['admin']}
 
+		{ _id: 'edit-other-user-password',
+		roles : ['admin']}
+
 		{ _id: 'assign-admin-role',
 		roles : ['admin']}
 

packages/rocketchat-channel-settings-mail-messages/client/lib/startup.coffee

+Meteor.startup ->
+	RocketChat.ChannelSettings.addOption
+		id: 'mail-messages'
+		template: 'channelSettingsMailMessages'
+		validation: ->
+			return RocketChat.authz.hasAllPermission('mail-messages')
+
+	RocketChat.callbacks.add 'roomExit', (mainNode) ->
+		instance = Blaze.getView($('.messages-box')?[0])?.templateInstance()
+		instance?.resetSelection(false)
+	, RocketChat.callbacks.priority.MEDIUM, 'room-exit-mail-messages'

packages/rocketchat-channel-settings-mail-messages/client/stylesheets/mail-messages.less

+.flex-tab {
+	.mail-message {
+		form {
+			margin-top: 20px;
+
+			.input-line.double-col {
+				margin-bottom: 20px;
+
+				label {
+					line-height: 15px;
+				}
+
+				div {
+					line-height: 15px;
+					i.octicon {
+						font-size: 13px;
+						opacity: 0.4;
+						vertical-align: top;
+					}
+				}
+			}
+		}
+	}
+}

packages/rocketchat-channel-settings-mail-messages/client/views/channelSettingsMailMessages.coffee

+Template.channelSettingsMailMessages.events
+	'click button.mail-messages': (e, t) ->
+		Session.set 'channelSettingsMailMessages', Session.get('openedRoom')
+		RocketChat.TabBar.setTemplate('mailMessagesInstructions')
+		view = Blaze.getView($('.messages-box')[0])
+		view?.templateInstance?().resetSelection?(true)
+
+Template.channelSettingsMailMessages.onCreated ->
+	view = Blaze.getView($('.messages-box')[0])
+	view?.templateInstance?().resetSelection?(false)

packages/rocketchat-channel-settings-mail-messages/client/views/channelSettingsMailMessages.html

+<template name="channelSettingsMailMessages">
+	<li>
+		<label>{{_ "Mail_Messages"}}</label>
+		<div>
+			<button type="button" class="button primary mail-messages">{{_ "Choose_messages"}}</button>
+		</div>
+	</li>
+</template>

packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.coffee

+Template.mailMessagesInstructions.helpers
+	name: ->
+		return Meteor.user().name
+	email: ->
+		return Meteor.user().emails?[0]?.address
+	roomName: ->
+		return ChatRoom.findOne(Session.get('openedRoom'))?.name
+	erroredEmails: ->
+		return Template.instance()?.erroredEmails.get().join(', ')
+
+Template.mailMessagesInstructions.events
+	'click .cancel': (e, t) ->
+		t.reset()
+
+	'click .send': (e, t) ->
+		t.$('.error').hide()
+		$btn = t.$('button.send')
+		oldBtnValue = $btn.html()
+		$btn.html(TAPi18n.__('Sending'))
+
+		selectedMessages = $('.messages-box .message.selected')
+
+		error = false
+		if selectedMessages.length is 0
+			t.$('.error-select').show()
+			error = true
+
+		if t.$('input[name=to]').val().trim()
+			rfcMailPatternWithName = /^(?:.*<)?([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)(?:>?)$/
+			emails = t.$('input[name=to]').val().trim().split(',')
+			erroredEmails = []
+			for email in emails
+				unless rfcMailPatternWithName.test email.trim()
+					erroredEmails.push email.trim()
+
+			t.erroredEmails.set erroredEmails
+			if erroredEmails.length > 0
+				t.$('.error-invalid-emails').show()
+				error = true
+		else
+			t.$('.error-missing-to').show()
+			error = true
+
+		if error
+			$btn.html(oldBtnValue)
+		else
+			data =
+				rid: Session.get('openedRoom')
+				to: t.$('input[name=to]').val().trim()
+				subject: t.$('input[name=subject]').val().trim()
+				messages: selectedMessages.map((i, message) -> return message.id).toArray()
+				language: localStorage.getItem('userLanguage')
+
+			Meteor.call 'mailMessages', data, (err, result) ->
+				$btn.html(oldBtnValue)
+				if err?
+					return toastr.error(err.reason or err.message)
+
+				toastr.success(TAPi18n.__('Your_email_has_been_queued_for_sending'))
+				t.reset()
+
+	'click .select-all': (e, t) ->
+		t.$('.error-select').hide()
+
+		view = Blaze.getView($('.messages-box')[0])
+		view?.templateInstance?().selectedMessages = _.pluck(ChatMessage.find({rid: Session.get('openedRoom')})?.fetch(), '_id')
+		$(".messages-box .message").addClass('selected')
+
+Template.mailMessagesInstructions.onCreated ->
+	@erroredEmails = new ReactiveVar []
+
+	@reset = ->
+		RocketChat.TabBar.setTemplate('channelSettings')
+		view = Blaze.getView($('.messages-box')[0])
+		view?.templateInstance?().resetSelection?(false)
+
+	@autorun =>
+		if Session.get('channelSettingsMailMessages') isnt Session.get('openedRoom')
+			this.reset()

packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.html

+<template name="mailMessagesInstructions">
+	<div class="content">
+		<div class="list-view mail-message">
+			<div class="status">
+				<h2>{{_ "Mail_Messages"}}</h2>
+			</div>
+			<p>{{_ "Mail_Messages_Instructions"}}</p>
+			<form>
+				<fieldset>
+					<div class="input-line double-col">
+						<label>{{_ "From"}}</label>
+						<div>{{name}}</div>
+						<div>{{email}}</div>
+					</div>
+					<div class="input-line double-col">
+						<label>{{_ "To"}}</label>
+						<div>
+							<input type="text" name="to" value="" />
+						</div>
+					</div>
+					<div class="input-line double-col">
+						<label>{{_ "Subject"}}</label>
+						<div>
+							<input type="text" name="subject" value="{{_ "Mail_Messages_Subject" roomName}}" />
+						</div>
+					</div>
+				</fieldset>
+			</form>
+			<div class="error error-missing-to alert alert-danger" style="display: none">
+				{{_ "Mail_Message_Missing_to"}}
+			</div>
+			<div class="error error-invalid-emails alert alert-danger" style="display: none">
+				{{_ "Mail_Message_Invalid_emails" erroredEmails}}
+			</div>
+			<div class="error error-select alert alert-danger" style="display: none">
+				{{{_ "Mail_Message_No_messages_selected_select_all"}}}
+			</div>
+			<p style="margin-top: 30px">
+				<button type="button" class="button secondary cancel">{{_ "Cancel"}}</button>
+				<button type="button" class="button primary send">{{_ "Send"}}</button>
+			</p>
+		</div>
+	</div>
+</template>

packages/rocketchat-channel-settings-mail-messages/i18n/en.i18n.json

+{
+	"Body" : "Body",
+	"Cancel" : "Cancel",
+	"Choose_messages" : "Choose messages",
+	"From" : "From",
+	"Mail_Message_Missing_to" : "You must provide one or more To e-mail addresses, separated by commas.",
+	"Mail_Message_No_messages_selected_select_all" : "You haven't selected any messages. Would you like to <a href='#' class='select-all'>select all</a> visible messages?",
+	"Mail_Messages" : "Mail Messages",
+	"Mail_Messages_Instructions" : "Choose which messages you want to send via e-mail by clicking the messages",
+	"Mail_Messages_Subject" : "Here's a selected portion of %s messages",
+	"Mail_Message_Invalid_emails" : "You have provided one or more invalid e-mails: %s",
+	"Send" : "Send",
+	"Sending" : "Sending...",
+	"Subject" : "Subject",
+	"To" : "To",
+	"Your_email_has_been_queued_for_sending" : "Your email has been queued for sending"
+}

packages/rocketchat-channel-settings-mail-messages/package.js

+Package.describe({
+	name: 'rocketchat:channel-settings-mail-messages',
+	version: '0.0.1',
+	summary: 'Channel Settings - Mail Messages',
+	git: ''
+});
+
+Package.onUse(function(api) {
+	api.versionsFrom('1.0');
+
+	api.use([
+		'coffeescript',
+		'templating',
+		'reactive-var',
+		'less@2.5.0',
+		'rocketchat:lib@0.0.1',
+		'rocketchat:channel-settings',
+		'momentjs:moment'
+	]);
+
+	api.addFiles([
+		'client/lib/startup.coffee',
+		'client/stylesheets/mail-messages.less',
+		'client/views/channelSettingsMailMessages.html',
+		'client/views/channelSettingsMailMessages.coffee',
+		'client/views/mailMessagesInstructions.html',
+		'client/views/mailMessagesInstructions.coffee'
+	], 'client');
+
+
+	api.addFiles([
+		'server/lib/startup.coffee',
+		'server/methods/mailMessages.coffee'
+	], 'server');
+
+	// TAPi18n
+	var _ = Npm.require('underscore');
+	var fs = Npm.require('fs');
+	tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-channel-settings-mail-messages/i18n'), function(filename) {
+		if (fs.statSync('packages/rocketchat-channel-settings-mail-messages/i18n/' + filename).size > 16) {
+			return 'i18n/' + filename;
+		}
+	}));
+	api.use('tap:i18n@1.6.1');
+	api.imply('tap:i18n');
+	api.addFiles(tapi18nFiles);
+});
+
+Package.onTest(function(api) {
+
+});

packages/rocketchat-channel-settings-mail-messages/server/lib/startup.coffee

+Meteor.startup ->
+	permission = { _id: 'mail-messages', roles : [ 'admin' ] }
+	RocketChat.models.Permissions.upsert( permission._id, { $setOnInsert : permission })

packages/rocketchat-channel-settings-mail-messages/server/methods/mailMessages.coffee

+Meteor.methods
+	'mailMessages': (data) ->
+		if not Meteor.userId()
+			throw new Meteor.Error('invalid-user', "[methods] mailMessages -> Invalid user")
+
+		check(data, Match.ObjectIncluding({ rid: String, to: String, subject: String, messages: [ String ], language: String }))
+
+		room = Meteor.call 'canAccessRoom', data.rid, Meteor.userId()
+		unless room
+			throw new Meteor.Error('invalid-room', "[methods] mailMessages -> Invalid room")
+
+		unless RocketChat.authz.hasPermission(Meteor.userId(), 'mail-messages')
+			throw new Meteor.Error 'not-authorized'
+
+		rfcMailPatternWithName = /^(?:.*<)?([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)(?:>?)$/
+		emails = data.to.trim().split(',')
+		for email in emails
+			unless rfcMailPatternWithName.test email.trim()
+				throw new Meteor.Error('invalid-email', "[methods] mailMessages -> Invalid e-mail")
+
+		user = Meteor.user()
+		name = user.name
+		email = user.emails?[0]?.address
+
+		if data.language isnt 'en'
+			localeFn = Meteor.call 'loadLocale', data.language
+			if localeFn
+				Function(localeFn)()
+
+		html = ""
+		RocketChat.models.Messages.findByRoomIdAndMessageIds(data.rid, data.messages, { sort: { ts: 1 } }).forEach (message) ->
+			dateTime = moment(message.ts).locale(data.language).format('L LT')
+			html += "<p style='margin-bottom: 5px'><b>#{message.u.username}</b> <span style='color: #aaa; font-size: 12px'>#{dateTime}</span><br />" + RocketChat.Message.parse(message, data.language) + "</p>"
+
+		Meteor.defer ->
+			Email.send
+				to: emails
+				from: RocketChat.settings.get('From_Email')
+				replyTo: email
+				subject: data.subject
+				html: html
+
+			console.log 'Sending email to ' + emails.join(', ')
+
+
+		return true

packages/rocketchat-channel-settings/client/lib/ChannelSettings.coffee

+RocketChat.ChannelSettings = new class
+	options = new ReactiveVar {}
+
+	###
+	# Adds an option in Channel Settings
+	# @config (object)
+	#   id: option id (required)
+	#   template (string): template name to render (required)
+	#   validation (function): if option should be displayed
+	###
+	addOption = (config) ->
+		unless config?.id
+			throw new Meteor.Error "ChannelSettings-addOption-error", "Option id was not informed."
+
+		Tracker.nonreactive ->
+			opts = options.get()
+			opts[config.id] = config
+			options.set opts
+
+	getOptions = ->
+		allOptions = _.toArray options.get()
+		allowedOptions = _.compact _.map allOptions, (option) ->
+			if not option.validation? or option.validation()
+				return option
+
+		return _.sortBy allowedOptions, 'order'
+
+	addOption: addOption
+	getOptions: getOptions

packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less

 .flex-tab {
 	.channel-settings {
-		margin-top: 60px;
-		padding: 20px;
+		ul {
+			li {
+				margin-bottom: 20px;
+			}
+		}
 
 		form {
 			label {
+				display: block;
+				font-weight: bold;
+				margin-bottom: 5px;
+			}
 
+			div span {
+				font-size: 14px;
+				i.octicon {
+					font-size: 12px;
+					vertical-align: middle;
+					margin-left: 3px;
+				}
 			}
 		}
 
@@ -19,15 +33,3 @@
 		}
 	}
 }
-
-.input-line.double-col {
-	div {
-		line-height: 15px;
-		padding: 10px 20px 10px 0;
-		i.octicon {
-			font-size: 13px;
-			opacity: 0.4;
-			vertical-align: top;
-		}
-	}
-}

packages/rocketchat-channel-settings/client/views/channelSettings.coffee

@@ -7,6 +7,8 @@ Template.channelSettings.helpers
 		return ChatRoom.findOne(@rid)?.t isnt 'd'
 	roomType: ->
 		return ChatRoom.findOne(@rid)?.t
+	channelSettings: ->
+		return RocketChat.ChannelSettings.getOptions()
 	roomTypeDescription: ->
 		roomType = ChatRoom.findOne(@rid)?.t
 		if roomType is 'c'
@@ -17,27 +19,10 @@ Template.channelSettings.helpers
 		return ChatRoom.findOne(@rid)?.name
 	roomTopic: ->
 		return ChatRoom.findOne(@rid)?.topic
+	archived: ->
+		return ChatRoom.findOne(@rid)?.archived
 
 Template.channelSettings.events
-	# 'click .save': (e, t) ->
-	# 	e.preventDefault()
-
-	# 	settings =
-	# 		roomType: t.$('input[name=roomType]:checked').val()
-	# 		roomName: t.$('input[name=roomName]').val()
-	# 		roomTopic: t.$('input[name=roomTopic]').val()
-
-	# 	if t.validate()
-	# 		Meteor.call 'saveRoomSettings', t.data.rid, settings, (err, results) ->
-	# 			if err
-	# 				if err.error in [ 'duplicate-name', 'name-invalid' ]
-	# 					return toastr.error TAPi18n.__(err.reason, err.details.channelName)
-	# 				if err.error is 'invalid-room-type'
-	# 					return toastr.error TAPi18n.__(err.reason, err.details.roomType)
-	# 				return toastr.error TAPi18n.__(err.reason)
-
-	# 			toastr.success TAPi18n.__ 'Settings_updated'
-
 	'keydown input[type=text]': (e, t) ->
 		if e.keyCode is 13
 			e.preventDefault()
@@ -56,6 +41,20 @@ Template.channelSettings.events
 		e.preventDefault()
 		t.saveSetting()
 
+	'click .archive': (e, t) ->
+		e.preventDefault()
+
+		Meteor.call 'archiveRoom', t.data.rid, true, (err, results) ->
+			return toastr.error err.reason if err
+			toastr.success TAPi18n.__ 'Room_archived'
+
+	'click .unarchive': (e, t) ->
+		e.preventDefault()
+
+		Meteor.call 'unarchiveRoom', t.data.rid, true, (err, results) ->
+			return toastr.error err.reason if err
+			toastr.success TAPi18n.__ 'Room_unarchived'
+
 Template.channelSettings.onCreated ->
 	@editing = new ReactiveVar