Merge branch 'fix/authorize-follow' into 'develop'

fix: authorize-follow not working due to redeclare 'acct'

Co-authored-by: 老周部落 <laozhoubuluo@gmail.com>

See merge request firefish/firefish!10759
This commit is contained in:
naskya 2024-04-23 14:55:04 +00:00
commit 8f68693510

View file

@ -24,16 +24,16 @@ async function follow(user): Promise<void> {
});
}
const acct = new URL(location.href).searchParams.get("acct");
if (acct == null) {
const acctUri = new URL(location.href).searchParams.get("acct");
if (acctUri == null) {
throw new Error("acct required");
}
let promise;
if (acct.startsWith("https://")) {
if (acctUri.startsWith("https://")) {
promise = os.api("ap/show", {
uri: acct,
uri: acctUri,
});
promise.then((res) => {
if (res.type === "User") {
@ -50,7 +50,7 @@ if (acct.startsWith("https://")) {
}
});
} else {
promise = os.api("users/show", acct.parse(acct));
promise = os.api("users/show", acct.parse(acctUri));
promise.then((user) => {
follow(user);
});