Refactor ISendFutureRequestOpts

Make it a union of timeout/action future request types, to make its
purpose more clear

Author: AndrewFerr

src/@types/requests.ts

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { EitherAnd } from "matrix-events-sdk/lib/types";
-
 import { IContent, IEvent } from "../models/event";
 import { Preset, Visibility } from "./partials";
 import { IEventWithRoomId, SearchKey } from "./search";
@@ -86,7 +84,10 @@ export interface IFutureTimeout {
     future_timeout: number;
 }
 
-export type ISendFutureRequestOpts = EitherAnd<IFutureGroupId, IFutureTimeout>;
+export type ISendTimeoutFutureRequestOpts = IFutureTimeout & Partial<IFutureGroupId>;
+export type ISendActionFutureRequestOpts = IFutureGroupId;
+
+export type ISendFutureRequestOpts = ISendTimeoutFutureRequestOpts | ISendActionFutureRequestOpts;
 
 export interface IFutureTokens {
     send_token: string;
@@ -100,7 +101,7 @@ export interface ITimeoutFutureTokens extends IFutureTokens {
 export type ISendActionFutureResponse = IFutureGroupId & IFutureTokens;
 export type ISendTimeoutFutureResponse = IFutureGroupId & ITimeoutFutureTokens;
 
-export type ISendFutureResponse<F extends ISendFutureRequestOpts> = F extends IFutureTimeout
+export type ISendFutureResponse<F extends ISendFutureRequestOpts> = F extends ISendTimeoutFutureRequestOpts
     ? ISendTimeoutFutureResponse
     : ISendActionFutureResponse;