From 28cbb6dc2176cb9ba57841c6dc52b9dbfaf074c8 Mon Sep 17 00:00:00 2001 From: Evan Minto Date: Mon, 6 Feb 2017 17:00:55 -0800 Subject: Add AS2 format to RABL files --- app/views/accounts/show.activitystreams2.rabl | 8 ++++++++ app/views/accounts/show.rabl | 8 -------- app/views/activitypub/base.activitystreams2.rabl | 1 + app/views/activitypub/base.rabl | 1 - app/views/activitypub/intransient.activitystreams2.rabl | 3 +++ app/views/activitypub/intransient.rabl | 3 --- app/views/activitypub/types/person.activitystreams2.rabl | 3 +++ app/views/activitypub/types/person.rabl | 3 --- 8 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 app/views/accounts/show.activitystreams2.rabl delete mode 100644 app/views/accounts/show.rabl create mode 100644 app/views/activitypub/base.activitystreams2.rabl delete mode 100644 app/views/activitypub/base.rabl create mode 100644 app/views/activitypub/intransient.activitystreams2.rabl delete mode 100644 app/views/activitypub/intransient.rabl create mode 100644 app/views/activitypub/types/person.activitystreams2.rabl delete mode 100644 app/views/activitypub/types/person.rabl diff --git a/app/views/accounts/show.activitystreams2.rabl b/app/views/accounts/show.activitystreams2.rabl new file mode 100644 index 000000000..dabae3f29 --- /dev/null +++ b/app/views/accounts/show.activitystreams2.rabl @@ -0,0 +1,8 @@ +extends 'activitypub/types/person.activitystreams2.rabl' + +object @account + +attributes display_name: :name, username: :preferredUsername, note: :summary + +node(:icon) { |account| full_asset_url(account.avatar.url(:original)) } +node(:image) { |account| full_asset_url(account.header.url(:original)) } diff --git a/app/views/accounts/show.rabl b/app/views/accounts/show.rabl deleted file mode 100644 index def91b425..000000000 --- a/app/views/accounts/show.rabl +++ /dev/null @@ -1,8 +0,0 @@ -extends 'activitypub/types/person.rabl' - -object @account - -attributes display_name: :name, username: :preferredUsername, note: :summary - -node(:icon) { |account| full_asset_url(account.avatar.url(:original)) } -node(:image) { |account| full_asset_url(account.header.url(:original)) } diff --git a/app/views/activitypub/base.activitystreams2.rabl b/app/views/activitypub/base.activitystreams2.rabl new file mode 100644 index 000000000..c5e94997a --- /dev/null +++ b/app/views/activitypub/base.activitystreams2.rabl @@ -0,0 +1 @@ +node(:'@context') { 'https://www.w3.org/ns/activitystreams' } diff --git a/app/views/activitypub/base.rabl b/app/views/activitypub/base.rabl deleted file mode 100644 index c5e94997a..000000000 --- a/app/views/activitypub/base.rabl +++ /dev/null @@ -1 +0,0 @@ -node(:'@context') { 'https://www.w3.org/ns/activitystreams' } diff --git a/app/views/activitypub/intransient.activitystreams2.rabl b/app/views/activitypub/intransient.activitystreams2.rabl new file mode 100644 index 000000000..968e451c2 --- /dev/null +++ b/app/views/activitypub/intransient.activitystreams2.rabl @@ -0,0 +1,3 @@ +extends 'activitypub/base.activitystreams2.rabl' + +node(:id) { request.original_url } diff --git a/app/views/activitypub/intransient.rabl b/app/views/activitypub/intransient.rabl deleted file mode 100644 index 21261f56d..000000000 --- a/app/views/activitypub/intransient.rabl +++ /dev/null @@ -1,3 +0,0 @@ -extends 'activitypub/base.rabl' - -node(:id) { request.original_url } diff --git a/app/views/activitypub/types/person.activitystreams2.rabl b/app/views/activitypub/types/person.activitystreams2.rabl new file mode 100644 index 000000000..487a60791 --- /dev/null +++ b/app/views/activitypub/types/person.activitystreams2.rabl @@ -0,0 +1,3 @@ +extends 'activitypub/intransient.activitystreams2.rabl' + +node(:type) { 'Person' } diff --git a/app/views/activitypub/types/person.rabl b/app/views/activitypub/types/person.rabl deleted file mode 100644 index c284fc53b..000000000 --- a/app/views/activitypub/types/person.rabl +++ /dev/null @@ -1,3 +0,0 @@ -extends 'activitypub/intransient.rabl' - -node(:type) { 'Person' } -- cgit