Merge pull request #168 from leocabeza/ngve-arregla-saludos

Ngve arregla saludos
ngVenezuela · Feb 26, 2019 · 035abc0 · 035abc0
2 parents ff290f3 + 04d22c6
commit 035abc0
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## 4.0.1 (2019-02-26)
+
+### Arreglado
+
+- Saludos a nuevos (ex)miembros
+
 ## 4.0.0 (2019-02-23)
 
 ### Agregado

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/listen-commands/admin/index.js b/src/listen-commands/admin/index.js
@@ -4,8 +4,12 @@ const { forwardMessage } = require('bot-api-overrides');
 const verifyUrls = async (bot, msg) => {
   const chatId = msg.chat.id;
   const chatInfo = await bot.getChat(chatId);
+  const {
+    type,
+    all_members_are_administrators: allMembersAreAdministrators,
+  } = chatInfo;
 
-  if (chatInfo.type === 'group') {
+  if (['group', 'supergroup'].includes(type) && !allMembersAreAdministrators) {
     const urlEntities = msg.entities
       ? msg.entities.filter(entity => entity.type === 'url')
       : [];

diff --git a/src/listen-commands/github/index.js b/src/listen-commands/github/index.js
@@ -73,7 +73,7 @@ const verifyCode = async (bot, msg) => {
   const chatId = msg.chat.id;
   const chatInfo = await bot.getChat(chatId);
 
-  if (chatInfo.type === 'group') {
+  if (['supergroup', 'group'].includes(chatInfo.type)) {
     if (!Object.prototype.hasOwnProperty.call(msg, 'entities')) {
       return;
     }

diff --git a/src/listen-commands/greetings/index.js b/src/listen-commands/greetings/index.js
@@ -18,7 +18,11 @@ const formatName = (firstName, userName) =>
 const sayHello = async (bot, msg) => {
   const chatId = msg.chat.id;
   const chatInfo = await bot.getChat(chatId);
-  if (chatInfo.type === 'group') {
+  const {
+    type,
+    all_members_are_administrators: allMembersAreAdministrators,
+  } = chatInfo;
+  if (['supergroup', 'group'].includes(type) && !allMembersAreAdministrators) {
     msg.new_chat_members.forEach(({ first_name, username }) => {
       const message = welcome.replace(
         '#{name}',
@@ -41,7 +45,11 @@ const sayGoodbye = async (bot, msg) => {
   const chatId = msg.chat.id;
   const chatInfo = await bot.getChat(chatId);
   const { first_name: firstName, username } = msg.left_chat_member;
-  if (chatInfo.type === 'group') {
+  const {
+    type,
+    all_members_are_administrators: allMembersAreAdministrators,
+  } = chatInfo;
+  if (['supergroup', 'group'].includes(type) && !allMembersAreAdministrators) {
     sendMessage(
       bot,
       msg.chat.id,