Allow announcements API to support staff targeting

lib/controllers/v1/announcements_controller.js

@@ -50,10 +50,19 @@ const AnnouncementsController = class AnnouncementsController {
     // when request is unauthenticated, or authenticated user has confirmed their email,
     // exclude announcements that are targeting users with unconfirmed emails
     if ( !req.userSession || ( req.userSession && req.userSession.emailConfirmed ) ) {
-      query = query.left_join( "preferences", null, "announcements.id = preferences.owner_id AND"
-        + " preferences.owner_type = 'Announcement' AND preferences.name = 'target_unconfirmed_users'"
-        + " AND preferences.value='t'" )
-        .where( "preferences.id IS NULL" );
+      query = query.left_join( "preferences prefs_unconfirmed", null, "announcements.id = prefs_unconfirmed.owner_id AND"
+        + " prefs_unconfirmed.owner_type = 'Announcement' AND prefs_unconfirmed.name = 'target_unconfirmed_users'"
+        + " AND prefs_unconfirmed.value='t'" )
+        .where( "prefs_unconfirmed.id IS NULL" );
+    }
+
+    // when request is unauthenticated, or authenticated is not staff,
+    // exclude announcements that are targeting staff
+    if ( !req.userSession || ( req.userSession && !req.userSession.isAdmin ) ) {
+      query = query.left_join( "preferences prefs_staff", null, "announcements.id = prefs_staff.owner_id AND"
+        + " prefs_staff.owner_type = 'Announcement' AND prefs_staff.name = 'target_staff'"
+        + " AND prefs_staff.value='t'" )
+        .where( "prefs_staff.id IS NULL" );
     }
 
     let announcementRows;