Reworked the code for sending notifications and checking for out of channel mentions to share some data

2 files changed, 16 insertions, 32 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 8ffbc8b14..12d53022e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -692,14 +692,6 @@
     "translation": "You do not have the appropriate permissions"
   },
   {
-    "id": "api.post.get_out_of_channel_mentions.retrieve_members.error",
-    "translation": "Failed to get channel members channel_id=%v err=%v"
-  },
-  {
-    "id": "api.post.get_out_of_channel_mentions.retrieve_profiles.error",
-    "translation": "Failed to retrieve user profiles team_id=%v, err=%v"
-  },
-  {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
     "translation": "Failed to compile @mention regex user_id=%v, err=%v"
   },
@@ -712,6 +704,14 @@
     "translation": "Encountered error getting channel, channel_id=%s, err=%v"
   },
   {
+    "id": "api.post.handle_post_events_and_forget.members.error",
+    "translation": "Failed to get channel members channel_id=%v err=%v"
+  },
+  {
+    "id": "api.post.handle_post_events_and_forget.profiles.error",
+    "translation": "Failed to retrieve user profiles team_id=%v, err=%v"
+  },
+  {
     "id": "api.post.handle_post_events_and_forget.team.error",
     "translation": "Encountered error getting team, team_id=%s, err=%v"
   },
@@ -752,10 +752,6 @@
     "translation": "Failed to update direct channel preference user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.members.error",
-    "translation": "Failed to get channel members channel_id=%v err=%v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_body",
     "translation": "You have one new mention."
   },
@@ -788,10 +784,6 @@
     "translation": "Failed to send push notificationid=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.retrive_profiles.error",
-    "translation": "Failed to retrieve user profiles team_id=%v, err=%v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.send.error",
     "translation": "Failed to send mention email successfully email=%v err=%v"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 50adbe092..6b1f18d92 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -684,14 +684,6 @@
     "translation": "No tienes los permisos apropiados"
   },
   {
-    "id": "api.post.get_out_of_channel_mentions.retrieve_members.error",
-    "translation": "Falla al obtener los miembros del canal channel_id=%v err=%v"
-  },
-  {
-    "id": "api.post.get_out_of_channel_mentions.retrieve_profiles.error",
-    "translation": "Falla al recuperar los perfiles de usuario team_id=%v, err=%v"
-  },
-  {
     "id": "api.post.get_post.permissions.app_error",
     "translation": "No tienes los permisos apropiados"
   },
@@ -700,6 +692,14 @@
     "translation": "Se encontró un error obteniendo el canal, channel_id=%s, err=%v"
   },
   {
+    "id": "api.post.handle_post_events_and_forget.members.error",
+    "translation": "Falla al obtener los miembros del canal channel_id=%v err=%v"
+  },
+  {
+    "id": "api.post.handle_post_events_and_forget.profiles.error",
+    "translation": "Falla al recuperar los perfiles de usuario team_id=%v, err=%v"
+  },
+  {
     "id": "api.post.handle_post_events_and_forget.team.error",
     "translation": "Se encontró un error obteniendo el equipo, team_id=%s, err=%v"
   },
@@ -740,10 +740,6 @@
     "translation": "Falla al actualizar las preferencias del canal directo user_id=%v other_user_id=%v err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.members.error",
-    "translation": "Falla al obtener los miembros del canal channel_id=%v err=%v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.mention_body",
     "translation": "Tienes una mención nueva."
   },
@@ -776,10 +772,6 @@
     "translation": "Falló el envio de la notificación push notificationid=%v, err=%v"
   },
   {
-    "id": "api.post.send_notifications_and_forget.retrive_profiles.error",
-    "translation": "Falla al recuperar los perfiles de usuario team_id=%v, err=%v"
-  },
-  {
     "id": "api.post.send_notifications_and_forget.send.error",
     "translation": "Falla al enviar el correo con la mención satisfactoriamente email=%v err=%v"
   },