summaryrefslogtreecommitdiff
path: root/src/client/pages
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2020-10-18 01:46:40 +0900
committerGitHub <noreply@github.com>2020-10-18 01:46:40 +0900
commit85a0f696bcea779b02749dae596fff94a1df2467 (patch)
tree747ee51f96c7ada22a835dfc7faee0b13cdfd0e4 /src/client/pages
parentFix lint (#6732) (diff)
downloadsharkey-85a0f696bcea779b02749dae596fff94a1df2467.tar.gz
sharkey-85a0f696bcea779b02749dae596fff94a1df2467.tar.bz2
sharkey-85a0f696bcea779b02749dae596fff94a1df2467.zip
ActivityPubでリモートのオブジェクトをGETするときのリクエストをHTTP Signatureで署名するオプション (#6731)
* Sign ActivityPub GET * Fix v12, v12.48.0 UI bug
Diffstat (limited to 'src/client/pages')
-rw-r--r--src/client/pages/follow.vue8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/client/pages/follow.vue b/src/client/pages/follow.vue
index 35d5cc3b26..13e0a62a0d 100644
--- a/src/client/pages/follow.vue
+++ b/src/client/pages/follow.vue
@@ -12,6 +12,7 @@ export default defineComponent({
const acct = new URL(location.href).searchParams.get('acct');
if (acct == null) return;
+ /*
const dialog = os.dialog({
type: 'waiting',
text: this.$t('fetchingAsApObject') + '...',
@@ -19,6 +20,7 @@ export default defineComponent({
showCancelButton: false,
cancelableByBgClick: false
});
+ */
if (acct.startsWith('https://')) {
os.api('ap/show', {
@@ -26,6 +28,8 @@ export default defineComponent({
}).then(res => {
if (res.type == 'User') {
this.follow(res.object);
+ } else if (res.type === 'Note') {
+ this.$router.push(`/notes/${res.object.id}`);
} else {
os.dialog({
type: 'error',
@@ -42,7 +46,7 @@ export default defineComponent({
window.close();
});
}).finally(() => {
- dialog.close();
+ //dialog.close();
});
} else {
os.api('users/show', parseAcct(acct)).then(user => {
@@ -55,7 +59,7 @@ export default defineComponent({
window.close();
});
}).finally(() => {
- dialog.close();
+ //dialog.close();
});
}
},