Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 10:06:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: bugs in user searching causing remote lookups to fail

Browse Source
This commit is contained in:
Julian Lam
2024-07-29 15:03:51 -04:00
parent 9a54f6bc7d
commit 1f896fb6ba
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/activitypub/helpers.js
View File

@@ -58,10 +58,12 @@ Helpers.query = async (id) => {
// username@host ids use acct: URI schema
const uri = isUri ? new URL(id) : new URL(`acct:${id}`);
// JS doesn't parse anything other than protocol and pathname from acct: URIs, so we need to just split id manually
const [username, hostname] = isUri ? [uri.pathname || uri.href, uri.host] : id.split('@');
let [username, hostname] = isUri ? [uri.pathname || uri.href, uri.host] : id.split('@');
if (!username || !hostname) {
return false;
}
username = username.trim();
hostname = hostname.trim();
const cached = webfingerCache.get(id);
if (cached !== undefined) {
@@ -159,7 +161,7 @@ Helpers.resolveLocalId = async (input) => {
return { type: null, id: null };
} else if (String(input).indexOf('@') !== -1) { // Webfinger
input = decodeURIComponent(input);
const [slug] = input.replace(/^acct:/, '').split('@');
const [slug] = input.replace(/^(acct:|@)/, '').split('@');
const uid = await user.getUidByUserslug(slug);
return { type: 'user', id: uid };
}