Regression: Various search provider fixes

packages/chatpal-search/client/template/admin.html

@@ -11,6 +11,7 @@
 			{{#unless isAdmin}}
 				<p>{{_ "You_are_not_authorized_to_view_this_page"}}</p>
 			{{else}}
+				<p>{{{_ "Chatpal_Get_more_information_about_chatpal_on_our_website"}}}</p>
 				<form>
 					<div class="rocket-form">
 						<fieldset>

packages/chatpal-search/package.js

@@ -17,7 +17,6 @@ Package.onUse(function(api) {
 	]);
 
 	api.addFiles('server/asset/chatpal-enter.svg', 'server', {isAsset:true});
-	api.addFiles('server/asset/chatpal-logo-icon-lightblue.svg', 'server', {isAsset:true});
 	api.addFiles('server/asset/chatpal-logo-icon-darkblue.svg', 'server', {isAsset:true});
 
 	api.addFiles([

packages/chatpal-search/server/asset/config.js

@@ -1,5 +1,4 @@
 /* globals Inject */
 
 Inject.rawBody('chatpal-enter', Assets.getText('server/asset/chatpal-enter.svg'));
-Inject.rawBody('chatpal-logo-icon-lightblue', Assets.getText('server/asset/chatpal-logo-icon-lightblue.svg'));
 Inject.rawBody('chatpal-logo-icon-darkblue', Assets.getText('server/asset/chatpal-logo-icon-darkblue.svg'));

packages/rocketchat-i18n/i18n/de.i18n.json

@@ -429,6 +429,7 @@
   "Chatpal_ERROR_username_already_exists": "Benutzername existiert bereits",
   "Chatpal_created_key_successfully": "API-Key erfolgreich erstellt",
   "Chatpal_run_search": "Suche",
+  "Chatpal_Get_more_information_about_chatpal_on_our_website": "Finden Sie mehr über Chatpal heraus, unter <a target=\"_blank\" href=\"http://chatpal.io\">http://chatpal.io</a>!",
   "CDN_PREFIX": "CDN-Präfix",
   "Certificates_and_Keys": "Zertifikate und Schlüssel",
   "Change_Room_Type": "Ändere den Typ des Raums",
@@ -2343,4 +2344,4 @@
   "your_message_optional": "Ihre optionale Nachricht",
   "Your_password_is_wrong": "Falsches Passwort",
   "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
-}
+}

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -432,6 +432,7 @@
   "Chatpal_ERROR_username_already_exists": "Username already exists",
   "Chatpal_created_key_successfully": "API-Key created successfully",
   "Chatpal_run_search": "Search",
+  "Chatpal_Get_more_information_about_chatpal_on_our_website": "Get more information about Chatpal on <a target=\"_blank\" href=\"http://chatpal.io\">http://chatpal.io</a>!",
   "CDN_PREFIX": "CDN Prefix",
   "Certificates_and_Keys": "Certificates and Keys",
   "Change_Room_Type": "Changing the Room Type",

packages/rocketchat-lib/server/functions/deleteMessage.js

@@ -23,12 +23,12 @@ RocketChat.deleteMessage = function(message, user) {
 		if (message.file && message.file._id) {
 			FileUpload.getStore('Uploads').deleteById(message.file._id);
 		}
-
-		Meteor.defer(function() {
-			RocketChat.callbacks.run('afterDeleteMessage', deletedMsg);
-		});
 	}
 
+	Meteor.defer(function() {
+		RocketChat.callbacks.run('afterDeleteMessage', deletedMsg || { _id: message._id });
+	});
+
 	// update last message
 	if (RocketChat.settings.get('Store_Last_Message')) {
 		const room = RocketChat.models.Rooms.findOneById(message.rid, { fields: { lastMessage: 1 } });

packages/rocketchat-search/client/search/search.js

@@ -67,7 +67,9 @@ Template.RocketSearch.onCreated(function() {
 				//TODO what should happen
 			} else {
 				this.suggestionActive.set(undefined);
-				this.suggestions.set(result);
+				if (value !== this.scope.text.get()) {
+					this.suggestions.set(result);
+				}
 			}
 		});
 	};