From 21eed23984791d90ff48b168b65d3b97d6bb74ab Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Sat, 7 May 2016 01:10:30 -0500 Subject: [PATCH 1/4] Add /shrug command --- .meteor/packages | 1 + .meteor/versions | 1 + packages/rocketchat-lib/i18n/en.i18n.json | 1 + .../rocketchat-slashcommands-shrug/package.js | 18 +++++++++++++++++ .../rocketchat-slashcommands-shrug/shrug.js | 20 +++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 packages/rocketchat-slashcommands-shrug/package.js create mode 100644 packages/rocketchat-slashcommands-shrug/shrug.js diff --git a/.meteor/packages b/.meteor/packages index 64123d8e036..dd9403394e7 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -80,6 +80,7 @@ rocketchat:slashcommands-join rocketchat:slashcommands-kick rocketchat:slashcommands-leave rocketchat:slashcommands-mute +rocketchat:slashcommands-shrug rocketchat:spotify rocketchat:statistics rocketchat:theme diff --git a/.meteor/versions b/.meteor/versions index aa2aa384c89..c94d037258d 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -178,6 +178,7 @@ rocketchat:slashcommands-join@0.0.1 rocketchat:slashcommands-kick@0.0.1 rocketchat:slashcommands-leave@0.0.1 rocketchat:slashcommands-mute@0.0.1 +rocketchat:slashcommands-shrug@0.0.1 rocketchat:sms@0.0.1 rocketchat:spotify@0.0.1 rocketchat:statistics@0.0.1 diff --git a/packages/rocketchat-lib/i18n/en.i18n.json b/packages/rocketchat-lib/i18n/en.i18n.json index d7a31de56d8..69bc4f715bb 100644 --- a/packages/rocketchat-lib/i18n/en.i18n.json +++ b/packages/rocketchat-lib/i18n/en.i18n.json @@ -918,6 +918,7 @@ "Site_Url" : "Site URL", "Site_Url_Description" : "Example: https://chat.domain.com/", "Skip" : "Skip", + "Slash_Shrug_Description" : "Displays ¯\\_(ツ)_/¯ after your message", "Smileys_and_People" : "Smileys & People", "SMS_Enabled" : "SMS Enabled", "SMTP" : "SMTP", diff --git a/packages/rocketchat-slashcommands-shrug/package.js b/packages/rocketchat-slashcommands-shrug/package.js new file mode 100644 index 00000000000..69db7fafdd3 --- /dev/null +++ b/packages/rocketchat-slashcommands-shrug/package.js @@ -0,0 +1,18 @@ +Package.describe({ + name: 'rocketchat:slashcommands-shrug', + version: '0.0.1', + summary: 'Message pre-processor that will translate /shrug commands', + git: '' +}); + +Package.onUse(function(api) { + api.versionsFrom('1.0'); + + api.use([ + 'rocketchat:lib' + ]); + + api.use('ecmascript'); + + api.addFiles('shrug.js', ['server', 'client']); +}); diff --git a/packages/rocketchat-slashcommands-shrug/shrug.js b/packages/rocketchat-slashcommands-shrug/shrug.js new file mode 100644 index 00000000000..a11be462970 --- /dev/null +++ b/packages/rocketchat-slashcommands-shrug/shrug.js @@ -0,0 +1,20 @@ +/* +* Shrug is a named function that will replace /shrug commands +* @param {Object} message - The message object +*/ + + +function Shrug (command, params, item) { + if (command === "shrug") { + var msg; + + msg = item; + msg.msg = params + ' ¯\\_(ツ)_/¯'; + Meteor.call('sendMessage', msg); + } +} + +RocketChat.slashCommands.add('shrug', Shrug, { + description: 'Slash_Shrug_Description', + params: 'your message (optional)' +}); From 6274a48da418403aacbd770b5e6b7d80ddcfec4d Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Sat, 7 May 2016 01:21:27 -0500 Subject: [PATCH 2/4] move /me into directory structure like the other slashcommands --- .meteor/packages | 2 +- .meteor/versions | 2 +- .../{rocketchat-me => rocketchat-slashcommands-me}/me.coffee | 0 .../{rocketchat-me => rocketchat-slashcommands-me}/package.js | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename packages/{rocketchat-me => rocketchat-slashcommands-me}/me.coffee (100%) rename packages/{rocketchat-me => rocketchat-slashcommands-me}/package.js (88%) diff --git a/.meteor/packages b/.meteor/packages index 64123d8e036..fe1c9e036a3 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -63,7 +63,6 @@ rocketchat:livechat rocketchat:logger rocketchat:mailer rocketchat:markdown -rocketchat:me rocketchat:mentions rocketchat:mentions-flextab rocketchat:message-attachments @@ -80,6 +79,7 @@ rocketchat:slashcommands-join rocketchat:slashcommands-kick rocketchat:slashcommands-leave rocketchat:slashcommands-mute +rocketchat:slashcommands-me rocketchat:spotify rocketchat:statistics rocketchat:theme diff --git a/.meteor/versions b/.meteor/versions index aa2aa384c89..506927a0ed9 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -160,7 +160,6 @@ rocketchat:livechat@0.0.1 rocketchat:logger@0.0.1 rocketchat:mailer@0.0.1 rocketchat:markdown@0.0.1 -rocketchat:me@0.0.1 rocketchat:mentions@0.0.1 rocketchat:mentions-flextab@0.0.1 rocketchat:message-attachments@0.0.1 @@ -177,6 +176,7 @@ rocketchat:slashcommands-invite@0.0.1 rocketchat:slashcommands-join@0.0.1 rocketchat:slashcommands-kick@0.0.1 rocketchat:slashcommands-leave@0.0.1 +rocketchat:slashcommands-me@0.0.1 rocketchat:slashcommands-mute@0.0.1 rocketchat:sms@0.0.1 rocketchat:spotify@0.0.1 diff --git a/packages/rocketchat-me/me.coffee b/packages/rocketchat-slashcommands-me/me.coffee similarity index 100% rename from packages/rocketchat-me/me.coffee rename to packages/rocketchat-slashcommands-me/me.coffee diff --git a/packages/rocketchat-me/package.js b/packages/rocketchat-slashcommands-me/package.js similarity index 88% rename from packages/rocketchat-me/package.js rename to packages/rocketchat-slashcommands-me/package.js index 0985fb40317..beb74ad941b 100644 --- a/packages/rocketchat-me/package.js +++ b/packages/rocketchat-slashcommands-me/package.js @@ -1,5 +1,5 @@ Package.describe({ - name: 'rocketchat:me', + name: 'rocketchat:slashcommands-me', version: '0.0.1', summary: 'Message pre-processor that will translate /me commands', git: '' From 879614a8626905f28a83f694d2690232df0f2ed1 Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Sat, 7 May 2016 01:53:57 -0500 Subject: [PATCH 3/4] eslint fixes --- packages/rocketchat-slashcommands-shrug/shrug.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-slashcommands-shrug/shrug.js b/packages/rocketchat-slashcommands-shrug/shrug.js index a11be462970..1ed5ffbc069 100644 --- a/packages/rocketchat-slashcommands-shrug/shrug.js +++ b/packages/rocketchat-slashcommands-shrug/shrug.js @@ -4,8 +4,8 @@ */ -function Shrug (command, params, item) { - if (command === "shrug") { +function Shrug(command, params, item) { + if (command === 'shrug') { var msg; msg = item; From 03598b8a0a3e8574c63776aa0efce0f7dced4896 Mon Sep 17 00:00:00 2001 From: Pavel Vanecek Date: Sun, 8 May 2016 11:03:50 +0200 Subject: [PATCH 4/4] Rendering emoji category header in a loop Instead of listing them one by one. Refactoring https://github.com/RocketChat/Rocket.Chat/pull/3032 --- packages/rocketchat-emojione/emojiPicker.html | 32 +++---------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/packages/rocketchat-emojione/emojiPicker.html b/packages/rocketchat-emojione/emojiPicker.html index 5854e69a2cc..3ae611e6b11 100644 --- a/packages/rocketchat-emojione/emojiPicker.html +++ b/packages/rocketchat-emojione/emojiPicker.html @@ -2,33 +2,11 @@
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • + {{#each category}} +
  • + +
    • + {{/each}}