autocomplete types: Remove AutocompleteOption type; simply use UserOrBot

This type saved us the trouble of faking every last boring detail of
a whole UserOrBot object, in the world where we used fake user-like
objects for wildcard mentions. We stopped using those in the
previous commit, so we don't need this type anymore, and we can just
say we're passing around whole UserOrBot objects because that's what
we're doing.

Author: chrisbobbe

src/autocomplete/PeopleAutocomplete.js

@@ -4,11 +4,10 @@ import React, { useCallback, useContext } from 'react';
 import type { Node } from 'react';
 import { SectionList } from 'react-native';
 
-import type { UserGroup, Narrow } from '../types';
+import type { UserOrBot, UserGroup, Narrow } from '../types';
 import { useSelector } from '../react-redux';
 import { getMutedUsers, getSortedUsers, getUserGroups } from '../selectors';
 import {
-  type AutocompleteOption,
   getAutocompleteSuggestion,
   getAutocompleteUserGroupSuggestions,
 } from '../users/userHelpers';
@@ -53,7 +52,7 @@ export default function PeopleAutocomplete(props: Props): Node {
   );
 
   const handleUserItemAutocomplete = useCallback(
-    (user: AutocompleteOption): void => {
+    (user: UserOrBot): void => {
       // If another user with the same full name is found, we send the
       // user ID as well, to ensure the mentioned user is uniquely identified.
       if (users.find(x => x.full_name === user.full_name && x.user_id !== user.user_id)) {
@@ -113,7 +112,7 @@ export default function PeopleAutocomplete(props: Props): Node {
           size="medium"
         />
       ),
-    }: Section<AutocompleteOption>),
+    }: Section<UserOrBot>),
   ];
 
   return (

src/users/userHelpers.js

@@ -58,13 +58,6 @@ export const sortUserList = (
       || x1.full_name.toLowerCase().localeCompare(x2.full_name.toLowerCase()),
   );
 
-export type AutocompleteOption = $ReadOnly<{
-  user_id: UserId,
-  email: string,
-  full_name: string,
-  ...
-}>;
-
 export const filterUserList = (
   users: $ReadOnlyArray<UserOrBot>,
   filter: string,
@@ -77,10 +70,10 @@ export const filterUserList = (
   );
 
 export const filterUserStartWith = (
-  users: $ReadOnlyArray<AutocompleteOption>,
+  users: $ReadOnlyArray<UserOrBot>,
   filter: string,
   ownUserId: UserId,
-): $ReadOnlyArray<AutocompleteOption> => {
+): $ReadOnlyArray<UserOrBot> => {
   const loweredFilter = filter.toLowerCase();
   const isAscii = /^[a-z]+$/.test(loweredFilter);
   return users.filter(user => {
@@ -90,10 +83,10 @@ export const filterUserStartWith = (
 };
 
 export const filterUserThatContains = (
-  users: $ReadOnlyArray<AutocompleteOption>,
+  users: $ReadOnlyArray<UserOrBot>,
   filter: string,
   ownUserId: UserId,
-): $ReadOnlyArray<AutocompleteOption> => {
+): $ReadOnlyArray<UserOrBot> => {
   const loweredFilter = filter.toLowerCase();
   const isAscii = /^[a-z]+$/.test(loweredFilter);
   return users.filter(user => {
@@ -103,24 +96,23 @@ export const filterUserThatContains = (
 };
 
 export const filterUserMatchesEmail = (
-  users: $ReadOnlyArray<AutocompleteOption>,
+  users: $ReadOnlyArray<UserOrBot>,
   filter: string,
   ownUserId: UserId,
-): $ReadOnlyArray<AutocompleteOption> =>
+): $ReadOnlyArray<UserOrBot> =>
   users.filter(
     user => user.user_id !== ownUserId && user.email.toLowerCase().includes(filter.toLowerCase()),
   );
 
-export const getUniqueUsers = (
-  users: $ReadOnlyArray<AutocompleteOption>,
-): $ReadOnlyArray<AutocompleteOption> => uniqby(users, 'email');
+export const getUniqueUsers = (users: $ReadOnlyArray<UserOrBot>): $ReadOnlyArray<UserOrBot> =>
+  uniqby(users, 'email');
 
 export const getAutocompleteSuggestion = (
-  users: $ReadOnlyArray<AutocompleteOption>,
+  users: $ReadOnlyArray<UserOrBot>,
   filter: string,
   ownUserId: UserId,
   mutedUsers: MutedUsersState,
-): $ReadOnlyArray<AutocompleteOption> => {
+): $ReadOnlyArray<UserOrBot> => {
   if (users.length === 0) {
     return users;
   }