show email address of recipient when inviting people to join discussi… (

#10808)

* show email address of recipient when inviting people to join discussion, poll, group, if you're an admin

this is because it's easy for two people to have the same name, and we need a way to tell them apart

app/controllers/api/v1/announcements_controller.rb

@@ -147,8 +147,14 @@ def notification_kinds
   end
 
   def default_scope
+    if target_model && target_model.respond_to?(:group_id)
+      is_admin = target_model.group_id ? target_model.group.admins.exists?(current_user.id) : target_model.admins.exists?(current_user.id)
+    else
+      is_admin = false
+    end
+
     super.merge(
-      include_email: (target_model && target_model.admins.exists?(current_user.id))
+      include_email: (is_admin)
     )
   end
 

app/controllers/api/v1/discussion_readers_controller.rb

@@ -48,7 +48,9 @@ def discussion_reader
   end
 
   def default_scope
-    super.merge({include_email: (@discussion_reader || @discussion).discussion.admins.exists?(current_user.id)})
+    discussion = (@discussion_reader || @discussion).discussion
+    is_admin = discussion.group_id ? discussion.group.admins.exists?(current_user.id) : discussion.admins.exists?(current_user.id)
+    super.merge({include_email: is_admin})
   end
 
   def accessible_records

vue/src/components/common/recipients_autocomplete.vue

@@ -392,6 +392,8 @@ div.recipients-autocomplete
           span(v-if="data.item.type == 'user' && currentUserId == data.item.id")
             space
             span ({{ $t('common.you') }})
+        v-list-item-subtitle(v-if="data.item.user && data.item.user.email")
+          span {{data.item.user.email}}
   notifications-count(
     v-show="!hideCount && recipients.length"
     :model='model'