Allows search to recognize full room links

src/components/structures/RoomDirectory.tsx

@@ -43,6 +43,7 @@ import { Action } from "../../dispatcher/actions";
 import PosthogTrackers from "../../PosthogTrackers";
 import { ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
 import { PublicRoomTile } from "../views/rooms/PublicRoomTile";
+import { transformSearchTerm } from "../../utils/SearchInput";
 
 const LAST_SERVER_KEY = "mx_last_room_directory_server";
 const LAST_INSTANCE_KEY = "mx_last_room_directory_instance";
@@ -164,10 +165,6 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
         this.getMoreRooms();
     };
 
-    private transformSearchTerm(term: string): string {
-        return term.substring(term.indexOf("#") +2);
-    };
-
     private getMoreRooms(): Promise<boolean> {
         if (!MatrixClientPeg.get()) return Promise.resolve(false);
 
@@ -190,7 +187,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
             opts.third_party_instance_id = this.state.instanceId as string;
         }
         if (this.nextBatch) opts.since = this.nextBatch;
-        if (filterString) opts.filter = { generic_search_term: this.transformSearchTerm(filterString) };
+        if (filterString) opts.filter = { generic_search_term: transformSearchTerm(filterString) };
         return MatrixClientPeg.get().publicRooms(opts).then((data) => {
             if (
                 filterString != this.state.filterString ||
@@ -326,7 +323,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
 
     private onFilterChange = (alias: string) => {
         this.setState({
-            filterString: this.transformSearchTerm(alias?.trim()) || "",
+            filterString: transformSearchTerm(alias?.trim()) || "",
         });
 
         // don't send the request for a little bit,

src/components/structures/RoomSearch.tsx

@@ -34,6 +34,8 @@ import Modal from "../../Modal";
 import SpotlightDialog from "../views/dialogs/SpotlightDialog";
 import { ALTERNATE_KEY_NAME, KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 import ToastStore from "../../stores/ToastStore";
+import { transformSearchTerm } from "../../utils/SearchInput";
+
 
 interface IProps {
     isMinimized: boolean;
@@ -134,13 +136,11 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
         }
     };
 
-    private transformSearchTerm(term: string): string {
-        return term.substring(term.indexOf("#") +2);
-    };
+
 
     private onChange = () => {
         if (this.elementRef.current?.tagName !== "INPUT") return;
-        this.setState({ query: this.transformSearchTerm((this.elementRef.current as HTMLInputElement).value) });
+        this.setState({ query: transformSearchTerm((this.elementRef.current as HTMLInputElement).value) });
     };
 
     private onFocus = (ev: React.FocusEvent<HTMLInputElement>) => {

src/components/views/dialogs/SpotlightDialog.tsx

@@ -74,6 +74,7 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { PosthogAnalytics } from "../../../PosthogAnalytics";
 import { getCachedRoomIDForAlias } from "../../../RoomAliasCache";
 import { roomContextDetailsText, spaceContextDetailsText } from "../../../utils/i18n-helpers";
+import { transformSearchTerm } from "../../../utils/SearchInput";
 
 const MAX_RECENT_SEARCHES = 10;
 const SECTION_LIMIT = 50; // only show 50 results per section for performance reasons
@@ -230,9 +231,6 @@ export const useWebSearchMetrics = (numResults: number, queryLength: number, via
     }, [numResults, queryLength, viaSpotlight]);
 };
 
-function transformSearchTerm(term: string): string {
-    return term.substring(term.indexOf("#") +2);
-};
 
 const SpotlightDialog: React.FC<IProps> = ({ initialText = "", onFinished }) => {
     const cli = MatrixClientPeg.get();

src/utils/SearchInput.ts

@@ -0,0 +1,31 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+/**
+ * Strips a string of https://matrix.to/#/
+ * eg https://matrix.to/#/#element-dev:matrix.org returns #element-dev:matrix.org
+ *
+ * @param {string} term The searchterm .
+ * @returns {string} Modifies string if it contains with https://matrix.to/#/ .
+ */
+
+export function transformSearchTerm(term: string): string {
+    if (/https:\/\/matrix.to\/#\//.test(term)) {
+        term = term.replace("https://matrix.to/#/", "");
+    }
+    return term;
+}