mirrors/firefish
1
0
Fork 1
mirror of https://git.joinfirefish.org/firefish/firefish.git synced 2024-05-19 09:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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
parent ccd26a826f 6a0ad409cd
commit 8f68693510
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/client/src/pages/follow.vue
View file

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