feedscout 1.7.1 → 1.8.1

package/dist/common/uris/platform/types.d.ts

@@ -1,9 +1,9 @@
-import { DiscoverFetchFn, DiscoverUriEntry } from "../../types.js";
+import { DiscoverFetchFn, DiscoverUriEntry, MaybePromise } from "../../types.js";
 
 //#region src/common/uris/platform/types.d.ts
 type PlatformHandler = {
   match: (url: string, content?: string, headers?: Headers) => boolean;
-  resolve: (url: string, content?: string, headers?: Headers, fetchFn?: DiscoverFetchFn) => Array<DiscoverUriEntry> | Promise<Array<DiscoverUriEntry>>;
+  resolve: (url: string, content?: string, headers?: Headers, fetchFn?: DiscoverFetchFn) => MaybePromise<Array<DiscoverUriEntry>>;
 };
 type PlatformMethodOptions = {
   baseUrl: string;

package/dist/common/utils.cjs

@@ -52,13 +52,6 @@ const omitEmpty = (array) => {
 	for (const item of array) if (item != null && item !== "") result.push(item);
 	return result;
 };
-const resolveUrl = (url, baseUrl) => {
-	try {
-		return new URL(url, baseUrl).href;
-	} catch {
-		return;
-	}
-};
 const matchesAnyOfLinkSelectors = (rel, type, selectors) => {
 	return selectors.some((selector) => {
 		if (!anyWordMatchesAnyOf(rel, [selector.rel])) return false;
@@ -94,4 +87,3 @@ exports.isSubdomainOf = isSubdomainOf;
 exports.matchesAnyOfLinkSelectors = matchesAnyOfLinkSelectors;
 exports.omitEmpty = omitEmpty;
 exports.processConcurrently = processConcurrently;
-exports.resolveUrl = resolveUrl;

package/dist/common/utils.js

@@ -52,13 +52,6 @@ const omitEmpty = (array) => {
 	for (const item of array) if (item != null && item !== "") result.push(item);
 	return result;
 };
-const resolveUrl = (url, baseUrl) => {
-	try {
-		return new URL(url, baseUrl).href;
-	} catch {
-		return;
-	}
-};
 const matchesAnyOfLinkSelectors = (rel, type, selectors) => {
 	return selectors.some((selector) => {
 		if (!anyWordMatchesAnyOf(rel, [selector.rel])) return false;
@@ -83,4 +76,4 @@ const processConcurrently = async (items, processFn, options) => {
 	}
 };
 //#endregion
-export { anyWordMatchesAnyOf, composeHint, endsWithAnyOf, hasMetaContent, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf, matchesAnyOfLinkSelectors, omitEmpty, processConcurrently, resolveUrl };
+export { anyWordMatchesAnyOf, composeHint, endsWithAnyOf, hasMetaContent, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf, matchesAnyOfLinkSelectors, omitEmpty, processConcurrently };

package/dist/favicons/defaults.cjs

@@ -2,8 +2,10 @@ const require_utils = require("../common/utils.cjs");
 const require_bluesky = require("./platform/handlers/bluesky.cjs");
 const require_codeberg = require("./platform/handlers/codeberg.cjs");
 const require_deviantart = require("./platform/handlers/deviantart.cjs");
+const require_devto = require("./platform/handlers/devto.cjs");
 const require_github = require("./platform/handlers/github.cjs");
 const require_githubGist = require("./platform/handlers/githubGist.cjs");
+const require_gitlab = require("./platform/handlers/gitlab.cjs");
 const require_lobsters = require("./platform/handlers/lobsters.cjs");
 const require_mastodon = require("./platform/handlers/mastodon.cjs");
 const require_reddit = require("./platform/handlers/reddit.cjs");
@@ -13,6 +15,7 @@ const require_tumblr = require("./platform/handlers/tumblr.cjs");
 const defaultIconRels = [
 	"icon",
 	"shortcut",
+	"alternate icon",
 	"apple-touch-icon",
 	"apple-touch-icon-precomposed"
 ];
@@ -40,6 +43,7 @@ const defaultGuessOptions = { uris: defaultGuessPaths };
 const defaultPlatformOptions = { handlers: [
 	require_github.githubHandler,
 	require_githubGist.githubGistHandler,
+	require_gitlab.gitlabHandler,
 	require_mastodon.mastodonHandler,
 	require_bluesky.blueskyHandler,
 	require_reddit.redditHandler,
@@ -47,7 +51,8 @@ const defaultPlatformOptions = { handlers: [
 	require_codeberg.codebergHandler,
 	require_lobsters.lobstersHandler,
 	require_sourceforge.sourceforgeHandler,
-	require_deviantart.deviantartHandler
+	require_deviantart.deviantartHandler,
+	require_devto.devtoHandler
 ] };
 //#endregion
 exports.defaultFeedOptions = defaultFeedOptions;

package/dist/favicons/defaults.js

@@ -2,8 +2,10 @@ import { omitEmpty } from "../common/utils.js";
 import { blueskyHandler } from "./platform/handlers/bluesky.js";
 import { codebergHandler } from "./platform/handlers/codeberg.js";
 import { deviantartHandler } from "./platform/handlers/deviantart.js";
+import { devtoHandler } from "./platform/handlers/devto.js";
 import { githubHandler } from "./platform/handlers/github.js";
 import { githubGistHandler } from "./platform/handlers/githubGist.js";
+import { gitlabHandler } from "./platform/handlers/gitlab.js";
 import { lobstersHandler } from "./platform/handlers/lobsters.js";
 import { mastodonHandler } from "./platform/handlers/mastodon.js";
 import { redditHandler } from "./platform/handlers/reddit.js";
@@ -13,6 +15,7 @@ import { tumblrHandler } from "./platform/handlers/tumblr.js";
 const defaultIconRels = [
 	"icon",
 	"shortcut",
+	"alternate icon",
 	"apple-touch-icon",
 	"apple-touch-icon-precomposed"
 ];
@@ -40,6 +43,7 @@ const defaultGuessOptions = { uris: defaultGuessPaths };
 const defaultPlatformOptions = { handlers: [
 	githubHandler,
 	githubGistHandler,
+	gitlabHandler,
 	mastodonHandler,
 	blueskyHandler,
 	redditHandler,
@@ -47,7 +51,8 @@ const defaultPlatformOptions = { handlers: [
 	codebergHandler,
 	lobstersHandler,
 	sourceforgeHandler,
-	deviantartHandler
+	deviantartHandler,
+	devtoHandler
 ] };
 //#endregion
 export { defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors };

package/dist/favicons/extractors.cjs

@@ -11,7 +11,7 @@ const isImageContent = (content) => {
 const isSuccessStatus = (status) => {
 	return status !== void 0 && status >= 200 && status < 400;
 };
-const defaultExtractor = (input) => {
+const defaultExtractFn = (input) => {
 	if (isImageContentType(input.headers) || isImageContent(input.content) || isSuccessStatus(input.status)) return {
 		url: input.url,
 		isValid: true
@@ -22,4 +22,4 @@ const defaultExtractor = (input) => {
 	};
 };
 //#endregion
-exports.defaultExtractor = defaultExtractor;
+exports.defaultExtractFn = defaultExtractFn;

package/dist/favicons/extractors.d.cts

@@ -2,6 +2,6 @@ import { DiscoverExtractFn } from "../common/types.cjs";
 import { FaviconResult } from "./types.cjs";
 
 //#region src/favicons/extractors.d.ts
-declare const defaultExtractor: DiscoverExtractFn<FaviconResult>;
+declare const defaultExtractFn: DiscoverExtractFn<FaviconResult>;
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/favicons/extractors.d.ts

@@ -2,6 +2,6 @@ import { DiscoverExtractFn } from "../common/types.js";
 import { FaviconResult } from "./types.js";
 
 //#region src/favicons/extractors.d.ts
-declare const defaultExtractor: DiscoverExtractFn<FaviconResult>;
+declare const defaultExtractFn: DiscoverExtractFn<FaviconResult>;
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/favicons/extractors.js

@@ -11,7 +11,7 @@ const isImageContent = (content) => {
 const isSuccessStatus = (status) => {
 	return status !== void 0 && status >= 200 && status < 400;
 };
-const defaultExtractor = (input) => {
+const defaultExtractFn = (input) => {
 	if (isImageContentType(input.headers) || isImageContent(input.content) || isSuccessStatus(input.status)) return {
 		url: input.url,
 		isValid: true
@@ -22,4 +22,4 @@ const defaultExtractor = (input) => {
 	};
 };
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/favicons/index.cjs

@@ -1,7 +1,6 @@
-const require_utils = require("../common/utils.cjs");
-const require_utils$1 = require("../common/discover/utils.cjs");
+const require_defaults = require("../common/discover/defaults.cjs");
 const require_index = require("../common/discover/index.cjs");
-const require_defaults = require("./defaults.cjs");
+const require_defaults$1 = require("./defaults.cjs");
 const require_extractors = require("./extractors.cjs");
 //#region src/favicons/index.ts
 const discoverFavicons = (input, options = {}) => {
@@ -14,16 +13,16 @@ const discoverFavicons = (input, options = {}) => {
 			"headers",
 			"guess"
 		],
-		fetchFn: options.fetchFn ?? require_utils$1.defaultFetchFn,
-		extractFn: options.extractFn ?? require_extractors.defaultExtractor,
-		resolveUrlFn: options.resolveUrlFn ?? require_utils.resolveUrl,
-		resolveSiteUrlFn: options.resolveSiteUrlFn ?? require_utils$1.defaultResolveSiteUrlFn
+		fetchFn: options.fetchFn ?? require_defaults.defaultFetchFn,
+		extractFn: options.extractFn ?? require_extractors.defaultExtractFn,
+		resolveUrlFn: options.resolveUrlFn ?? require_defaults.defaultResolveUrlFn,
+		resolveSiteUrlFn: options.resolveSiteUrlFn ?? require_defaults.defaultResolveSiteUrlFn
 	}, {
-		platform: require_defaults.defaultPlatformOptions,
-		feed: require_defaults.defaultFeedOptions,
-		html: require_defaults.defaultHtmlOptions,
-		headers: require_defaults.defaultHeadersOptions,
-		guess: require_defaults.defaultGuessOptions
+		platform: require_defaults$1.defaultPlatformOptions,
+		feed: require_defaults$1.defaultFeedOptions,
+		html: require_defaults$1.defaultHtmlOptions,
+		headers: require_defaults$1.defaultHeadersOptions,
+		guess: require_defaults$1.defaultGuessOptions
 	});
 };
 //#endregion

package/dist/favicons/index.js

@@ -1,8 +1,7 @@
-import { resolveUrl } from "../common/utils.js";
-import { defaultFetchFn, defaultResolveSiteUrlFn } from "../common/discover/utils.js";
+import { defaultFetchFn, defaultResolveSiteUrlFn, defaultResolveUrlFn } from "../common/discover/defaults.js";
 import { discover } from "../common/discover/index.js";
 import { defaultFeedOptions, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions } from "./defaults.js";
-import { defaultExtractor } from "./extractors.js";
+import { defaultExtractFn } from "./extractors.js";
 //#region src/favicons/index.ts
 const discoverFavicons = (input, options = {}) => {
 	return discover(input, {
@@ -15,8 +14,8 @@ const discoverFavicons = (input, options = {}) => {
 			"guess"
 		],
 		fetchFn: options.fetchFn ?? defaultFetchFn,
-		extractFn: options.extractFn ?? defaultExtractor,
-		resolveUrlFn: options.resolveUrlFn ?? resolveUrl,
+		extractFn: options.extractFn ?? defaultExtractFn,
+		resolveUrlFn: options.resolveUrlFn ?? defaultResolveUrlFn,
 		resolveSiteUrlFn: options.resolveSiteUrlFn ?? defaultResolveSiteUrlFn
 	}, {
 		platform: defaultPlatformOptions,

package/dist/favicons/platform/handlers/bluesky.cjs

@@ -9,7 +9,7 @@ const isProfilePath = (pathname) => {
 const blueskyHandler = {
 	match: (url) => {
 		try {
-			return require_utils.isHostOf(url, hosts) && isProfilePath(new URL(url).pathname);
+			return isProfilePath(new URL(url).pathname) && require_utils.isHostOf(url, hosts);
 		} catch {}
 		return false;
 	},

package/dist/favicons/platform/handlers/bluesky.js

@@ -9,7 +9,7 @@ const isProfilePath = (pathname) => {
 const blueskyHandler = {
 	match: (url) => {
 		try {
-			return isHostOf(url, hosts) && isProfilePath(new URL(url).pathname);
+			return isProfilePath(new URL(url).pathname) && isHostOf(url, hosts);
 		} catch {}
 		return false;
 	},

package/dist/favicons/platform/handlers/codeberg.cjs

@@ -1,15 +1,16 @@
 const require_utils = require("../../../common/utils.cjs");
 const require_codeberg = require("../../../feeds/platform/handlers/codeberg.cjs");
 //#region src/favicons/platform/handlers/codeberg.ts
+const userRegex = /^\/([^/.]+)/;
 const codebergHandler = {
 	match: (url) => {
 		return require_utils.isHostOf(url, require_codeberg.hosts);
 	},
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
-		const segments = pathname.split("/").filter(Boolean);
-		if (segments.length === 0) return [];
-		const username = segments[0];
+		const match = pathname.match(userRegex);
+		if (!match?.[1]) return [];
+		const username = match[1];
 		if (require_utils.isAnyOf(username, require_codeberg.excludedPaths)) return [];
 		return [{ uri: `${origin}/user/avatar/${username}/512` }];
 	}

package/dist/favicons/platform/handlers/codeberg.js

@@ -1,15 +1,16 @@
 import { isAnyOf, isHostOf } from "../../../common/utils.js";
 import { excludedPaths, hosts } from "../../../feeds/platform/handlers/codeberg.js";
 //#region src/favicons/platform/handlers/codeberg.ts
+const userRegex = /^\/([^/.]+)/;
 const codebergHandler = {
 	match: (url) => {
 		return isHostOf(url, hosts);
 	},
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
-		const segments = pathname.split("/").filter(Boolean);
-		if (segments.length === 0) return [];
-		const username = segments[0];
+		const match = pathname.match(userRegex);
+		if (!match?.[1]) return [];
+		const username = match[1];
 		if (isAnyOf(username, excludedPaths)) return [];
 		return [{ uri: `${origin}/user/avatar/${username}/512` }];
 	}

package/dist/favicons/platform/handlers/devto.cjs

@@ -0,0 +1,31 @@
+const require_utils = require("../../../common/utils.cjs");
+const require_utils$1 = require("../../utils.cjs");
+const require_devto = require("../../../feeds/platform/handlers/devto.cjs");
+//#region src/favicons/platform/handlers/devto.ts
+const userRegex = /^\/([^/.]+)/;
+const devtoHandler = {
+	match: (url) => {
+		try {
+			const { pathname } = new URL(url);
+			const match = pathname.match(userRegex);
+			if (!require_utils.isHostOf(url, require_devto.hosts) || !match?.[1]) return false;
+			if (match[1] === "t") return false;
+			return !require_utils.isAnyOf(match[1], require_devto.excludedPaths);
+		} catch {}
+		return false;
+	},
+	resolve: async (url, _content, _headers, fetchFn) => {
+		if (!fetchFn) return [];
+		try {
+			const { pathname } = new URL(url);
+			const match = pathname.match(userRegex);
+			if (!match?.[1] || match[1] === "t") return [];
+			const username = match[1];
+			const profileImage = require_utils$1.parseBodyJson((await fetchFn(`https://dev.to/api/users/by_username?url=${encodeURIComponent(username)}`)).body)?.profile_image;
+			if (require_utils$1.isNonEmptyString(profileImage)) return [{ uri: profileImage }];
+		} catch {}
+		return [];
+	}
+};
+//#endregion
+exports.devtoHandler = devtoHandler;

package/dist/favicons/platform/handlers/devto.js

@@ -0,0 +1,31 @@
+import { isAnyOf, isHostOf } from "../../../common/utils.js";
+import { isNonEmptyString, parseBodyJson } from "../../utils.js";
+import { excludedPaths, hosts } from "../../../feeds/platform/handlers/devto.js";
+//#region src/favicons/platform/handlers/devto.ts
+const userRegex = /^\/([^/.]+)/;
+const devtoHandler = {
+	match: (url) => {
+		try {
+			const { pathname } = new URL(url);
+			const match = pathname.match(userRegex);
+			if (!isHostOf(url, hosts) || !match?.[1]) return false;
+			if (match[1] === "t") return false;
+			return !isAnyOf(match[1], excludedPaths);
+		} catch {}
+		return false;
+	},
+	resolve: async (url, _content, _headers, fetchFn) => {
+		if (!fetchFn) return [];
+		try {
+			const { pathname } = new URL(url);
+			const match = pathname.match(userRegex);
+			if (!match?.[1] || match[1] === "t") return [];
+			const username = match[1];
+			const profileImage = parseBodyJson((await fetchFn(`https://dev.to/api/users/by_username?url=${encodeURIComponent(username)}`)).body)?.profile_image;
+			if (isNonEmptyString(profileImage)) return [{ uri: profileImage }];
+		} catch {}
+		return [];
+	}
+};
+//#endregion
+export { devtoHandler };

package/dist/favicons/platform/handlers/github.cjs

@@ -1,15 +1,16 @@
 const require_utils = require("../../../common/utils.cjs");
 const require_github = require("../../../feeds/platform/handlers/github.cjs");
 //#region src/favicons/platform/handlers/github.ts
+const userRegex = /^\/([^/.]+)/;
 const githubHandler = {
 	match: (url) => {
 		return require_utils.isHostOf(url, require_github.hosts);
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const segments = pathname.split("/").filter(Boolean);
-		if (segments.length === 0) return [];
-		const user = segments[0];
+		const match = pathname.match(userRegex);
+		if (!match?.[1]) return [];
+		const user = match[1];
 		if (require_utils.isAnyOf(user, require_github.excludedPaths)) return [];
 		return [{ uri: `https://github.com/${user}.png` }];
 	}

package/dist/favicons/platform/handlers/github.js

@@ -1,15 +1,16 @@
 import { isAnyOf, isHostOf } from "../../../common/utils.js";
 import { excludedPaths, hosts } from "../../../feeds/platform/handlers/github.js";
 //#region src/favicons/platform/handlers/github.ts
+const userRegex = /^\/([^/.]+)/;
 const githubHandler = {
 	match: (url) => {
 		return isHostOf(url, hosts);
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const segments = pathname.split("/").filter(Boolean);
-		if (segments.length === 0) return [];
-		const user = segments[0];
+		const match = pathname.match(userRegex);
+		if (!match?.[1]) return [];
+		const user = match[1];
 		if (isAnyOf(user, excludedPaths)) return [];
 		return [{ uri: `https://github.com/${user}.png` }];
 	}

package/dist/favicons/platform/handlers/githubGist.cjs

@@ -1,15 +1,16 @@
 const require_utils = require("../../../common/utils.cjs");
 const require_githubGist = require("../../../feeds/platform/handlers/githubGist.cjs");
 //#region src/favicons/platform/handlers/githubGist.ts
+const userRegex = /^\/([^/.]+)/;
 const githubGistHandler = {
 	match: (url) => {
 		return require_utils.isHostOf(url, require_githubGist.hosts);
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const segments = pathname.split("/").filter(Boolean);
-		if (segments.length === 0) return [];
-		const user = segments[0];
+		const match = pathname.match(userRegex);
+		if (!match?.[1]) return [];
+		const user = match[1];
 		if (require_utils.isAnyOf(user, require_githubGist.excludedPaths)) return [];
 		return [{ uri: `https://github.com/${user}.png` }];
 	}

package/dist/favicons/platform/handlers/githubGist.js

@@ -1,15 +1,16 @@
 import { isAnyOf, isHostOf } from "../../../common/utils.js";
 import { excludedPaths, hosts } from "../../../feeds/platform/handlers/githubGist.js";
 //#region src/favicons/platform/handlers/githubGist.ts
+const userRegex = /^\/([^/.]+)/;
 const githubGistHandler = {
 	match: (url) => {
 		return isHostOf(url, hosts);
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const segments = pathname.split("/").filter(Boolean);
-		if (segments.length === 0) return [];
-		const user = segments[0];
+		const match = pathname.match(userRegex);
+		if (!match?.[1]) return [];
+		const user = match[1];
 		if (isAnyOf(user, excludedPaths)) return [];
 		return [{ uri: `https://github.com/${user}.png` }];
 	}

package/dist/favicons/platform/handlers/gitlab.cjs

@@ -0,0 +1,38 @@
+const require_utils = require("../../../common/utils.cjs");
+const require_utils$1 = require("../../utils.cjs");
+const require_gitlab = require("../../../feeds/platform/handlers/gitlab.cjs");
+//#region src/favicons/platform/handlers/gitlab.ts
+const userRegex = /^\/([^/]+?)(?:\.atom)?(?:\/|$)/;
+const fetchAvatarUrl = async (apiUrl, fetchFn) => {
+	const data = require_utils$1.parseBodyJson((await fetchFn(apiUrl)).body);
+	const entry = Array.isArray(data) ? data[0] : data;
+	if (require_utils$1.isNonEmptyString(entry?.avatar_url)) return entry.avatar_url;
+};
+const gitlabHandler = {
+	match: (url, content, headers) => {
+		try {
+			if (require_utils.isHostOf(url, require_gitlab.hosts)) return true;
+			const { pathname } = new URL(url);
+			if (!userRegex.test(pathname)) return false;
+			if (content && require_gitlab.isGitlabHtml(content)) return true;
+			if (headers && require_gitlab.isGitlabHeaders(headers)) return true;
+		} catch {}
+		return false;
+	},
+	resolve: async (url, _content, _headers, fetchFn) => {
+		if (!fetchFn) return [];
+		try {
+			const { origin, pathname } = new URL(url);
+			const match = pathname.match(userRegex);
+			if (!match?.[1]) return [];
+			const username = match[1];
+			if (require_utils.isAnyOf(username, require_gitlab.excludedPaths)) return [];
+			const encodedName = encodeURIComponent(username);
+			const avatarUrl = await fetchAvatarUrl(`${origin}/api/v4/users?username=${encodedName}`, fetchFn) ?? await fetchAvatarUrl(`${origin}/api/v4/groups/${encodedName}`, fetchFn);
+			if (avatarUrl) return [{ uri: avatarUrl }];
+		} catch {}
+		return [];
+	}
+};
+//#endregion
+exports.gitlabHandler = gitlabHandler;

package/dist/favicons/platform/handlers/gitlab.js

@@ -0,0 +1,38 @@
+import { isAnyOf, isHostOf } from "../../../common/utils.js";
+import { isNonEmptyString, parseBodyJson } from "../../utils.js";
+import { excludedPaths, hosts, isGitlabHeaders, isGitlabHtml } from "../../../feeds/platform/handlers/gitlab.js";
+//#region src/favicons/platform/handlers/gitlab.ts
+const userRegex = /^\/([^/]+?)(?:\.atom)?(?:\/|$)/;
+const fetchAvatarUrl = async (apiUrl, fetchFn) => {
+	const data = parseBodyJson((await fetchFn(apiUrl)).body);
+	const entry = Array.isArray(data) ? data[0] : data;
+	if (isNonEmptyString(entry?.avatar_url)) return entry.avatar_url;
+};
+const gitlabHandler = {
+	match: (url, content, headers) => {
+		try {
+			if (isHostOf(url, hosts)) return true;
+			const { pathname } = new URL(url);
+			if (!userRegex.test(pathname)) return false;
+			if (content && isGitlabHtml(content)) return true;
+			if (headers && isGitlabHeaders(headers)) return true;
+		} catch {}
+		return false;
+	},
+	resolve: async (url, _content, _headers, fetchFn) => {
+		if (!fetchFn) return [];
+		try {
+			const { origin, pathname } = new URL(url);
+			const match = pathname.match(userRegex);
+			if (!match?.[1]) return [];
+			const username = match[1];
+			if (isAnyOf(username, excludedPaths)) return [];
+			const encodedName = encodeURIComponent(username);
+			const avatarUrl = await fetchAvatarUrl(`${origin}/api/v4/users?username=${encodedName}`, fetchFn) ?? await fetchAvatarUrl(`${origin}/api/v4/groups/${encodedName}`, fetchFn);
+			if (avatarUrl) return [{ uri: avatarUrl }];
+		} catch {}
+		return [];
+	}
+};
+//#endregion
+export { gitlabHandler };

package/dist/favicons/platform/handlers/lobsters.cjs

@@ -1,18 +1,18 @@
 const require_utils = require("../../../common/utils.cjs");
 const require_lobsters = require("../../../feeds/platform/handlers/lobsters.cjs");
 //#region src/favicons/platform/handlers/lobsters.ts
-const userPathRegex = /^\/~([a-zA-Z0-9_-]+)/;
+const userRegex = /^\/~([a-zA-Z0-9_-]+)/;
 const lobstersHandler = {
 	match: (url) => {
 		try {
 			const { pathname } = new URL(url);
-			return require_utils.isHostOf(url, require_lobsters.hosts) && userPathRegex.test(pathname);
+			return require_utils.isHostOf(url, require_lobsters.hosts) && userRegex.test(pathname);
 		} catch {}
 		return false;
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const match = pathname.match(userPathRegex);
+		const match = pathname.match(userRegex);
 		if (!match?.[1]) return [];
 		return [{ uri: `https://lobste.rs/avatars/${match[1]}-100.png` }];
 	}

package/dist/favicons/platform/handlers/lobsters.js

@@ -1,18 +1,18 @@
 import { isHostOf } from "../../../common/utils.js";
 import { hosts } from "../../../feeds/platform/handlers/lobsters.js";
 //#region src/favicons/platform/handlers/lobsters.ts
-const userPathRegex = /^\/~([a-zA-Z0-9_-]+)/;
+const userRegex = /^\/~([a-zA-Z0-9_-]+)/;
 const lobstersHandler = {
 	match: (url) => {
 		try {
 			const { pathname } = new URL(url);
-			return isHostOf(url, hosts) && userPathRegex.test(pathname);
+			return isHostOf(url, hosts) && userRegex.test(pathname);
 		} catch {}
 		return false;
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const match = pathname.match(userPathRegex);
+		const match = pathname.match(userRegex);
 		if (!match?.[1]) return [];
 		return [{ uri: `https://lobste.rs/avatars/${match[1]}-100.png` }];
 	}

package/dist/favicons/platform/handlers/mastodon.cjs

@@ -2,9 +2,9 @@ const require_utils = require("../../../common/utils.cjs");
 const require_utils$1 = require("../../utils.cjs");
 //#region src/favicons/platform/handlers/mastodon.ts
 const mastodonRegex = /mastodon/i;
+const profileRegex = /^\/@([^/.]+(?:@[^/.]+\.[^/.]+)?)(?:\.rss)?\/?$/;
 const isProfilePath = (pathname) => {
-	const segments = pathname.split("/").filter(Boolean);
-	return segments.length === 1 && segments[0].startsWith("@");
+	return profileRegex.test(pathname);
 };
 const isMastodonHtml = (content) => {
 	return require_utils.hasMetaContent(content, "generator", "Mastodon");
@@ -26,7 +26,9 @@ const mastodonHandler = {
 		if (!fetchFn) return [];
 		try {
 			const { hostname, pathname } = new URL(url);
-			const data = require_utils$1.parseBodyJson((await fetchFn(`https://${hostname}/api/v1/accounts/lookup?acct=${pathname.split("/").filter(Boolean)[0].replace("@", "")}`)).body);
+			const match = pathname.match(profileRegex);
+			if (!match?.[1]) return [];
+			const data = require_utils$1.parseBodyJson((await fetchFn(`https://${hostname}/api/v1/accounts/lookup?acct=${match[1]}`)).body);
 			if (require_utils$1.isNonEmptyString(data.avatar)) return [{ uri: data.avatar }];
 		} catch {}
 		return [];

package/dist/favicons/platform/handlers/mastodon.js

@@ -2,9 +2,9 @@ import { hasMetaContent } from "../../../common/utils.js";
 import { isNonEmptyString, parseBodyJson } from "../../utils.js";
 //#region src/favicons/platform/handlers/mastodon.ts
 const mastodonRegex = /mastodon/i;
+const profileRegex = /^\/@([^/.]+(?:@[^/.]+\.[^/.]+)?)(?:\.rss)?\/?$/;
 const isProfilePath = (pathname) => {
-	const segments = pathname.split("/").filter(Boolean);
-	return segments.length === 1 && segments[0].startsWith("@");
+	return profileRegex.test(pathname);
 };
 const isMastodonHtml = (content) => {
 	return hasMetaContent(content, "generator", "Mastodon");
@@ -26,7 +26,9 @@ const mastodonHandler = {
 		if (!fetchFn) return [];
 		try {
 			const { hostname, pathname } = new URL(url);
-			const data = parseBodyJson((await fetchFn(`https://${hostname}/api/v1/accounts/lookup?acct=${pathname.split("/").filter(Boolean)[0].replace("@", "")}`)).body);
+			const match = pathname.match(profileRegex);
+			if (!match?.[1]) return [];
+			const data = parseBodyJson((await fetchFn(`https://${hostname}/api/v1/accounts/lookup?acct=${match[1]}`)).body);
 			if (isNonEmptyString(data.avatar)) return [{ uri: data.avatar }];
 		} catch {}
 		return [];