imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer URL constructor over url dependency

Browse source
This commit is contained in:
Michael Telatynski 2021-07-16 13:18:12 +01:00
parent 9d45a3760f
commit 3b13eb7b44
3 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/utils/HostingLink.js
View file

@ -14,11 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import url from 'url';
import SdkConfig from '../SdkConfig';
import { MatrixClientPeg } from '../MatrixClientPeg';
import { urlSearchParamsToObject } from "./UrlUtils";
export function getHostingLink(campaign) {
const hostingLink = SdkConfig.get().hosting_signup_link;
@ -28,11 +25,8 @@ export function getHostingLink(campaign) {
if (MatrixClientPeg.get().getDomain() !== 'matrix.org') return null;
try {
const hostingUrl = url.parse(hostingLink);
const params = urlSearchParamsToObject(new URLSearchParams(hostingUrl.query));
params.utm_campaign = campaign;
hostingUrl.search = undefined;
hostingUrl.query = params;
const hostingUrl = new URL(hostingLink);
hostingUrl.searchParams.set("utm_campaign", campaign);
return hostingUrl.format();
} catch (e) {
return hostingLink;

4
src/utils/UrlUtils.ts
View file

@ -16,10 +16,6 @@ limitations under the License.
import * as url from "url";
export function urlSearchParamsToObject<T extends {}>(params: URLSearchParams) {
return <T>Object.fromEntries([...params.entries()]);
}
/**
* If a url has no path component, etc. abbreviate it to just the hostname
*