Skip to content

Send short account URL to remote instance (regression from #3844)#4355

Merged
Gargron merged 2 commits intomastodon:masterfrom
ykzts:short-account-url
Jul 25, 2017
Merged

Send short account URL to remote instance (regression from #3844)#4355
Gargron merged 2 commits intomastodon:masterfrom
ykzts:short-account-url

Conversation

@ykzts
Copy link
Copy Markdown
Member

@ykzts ykzts commented Jul 25, 2017

Resolve #4347

--- /tmp/before.json	2017-07-25 17:12:28.000000000 +0900
+++ /tmp/after.json	2017-07-25 17:12:19.000000000 +0900
@@ -8,7 +8,7 @@
     {
       "rel": "http://webfinger.net/rel/profile-page",
       "type": "text/html",
-      "href": "http://localhost:3000/users/ykzts"
+      "href": "http://localhost:3000/@ykzts"
     },
     {
       "rel": "http://schemas.google.com/g/2010#updates-from",
@@ -18,7 +18,7 @@
     {
       "rel": "self",
       "type": "application/activity+json",
-      "href": "http://localhost:3000/users/ykzts"
+      "href": "http://localhost:3000/users/ykzts.json"
     },
     {
       "rel": "salmon",

@ykzts ykzts added the bug Something isn't working label Jul 25, 2017
{ rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(@account) },
{ rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') },
{ rel: 'self', type: 'application/activity+json', href: account_url(@account) },
{ rel: 'self', type: 'application/activity+json', href: account_url(@account, format: 'json') },
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ActivityPub self link needs no format because the format is supposed to depend on request header.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay. i fixed 316c8b5

@Gargron Gargron merged commit e5c0aa6 into mastodon:master Jul 25, 2017
@ykzts ykzts deleted the short-account-url branch July 25, 2017 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants