Merge branch 'marrus-sh-mastodon-site-api'

This commit is contained in:
Eugen Rochko 2017-03-15 23:13:18 +01:00
commit a2696cf542
4 changed files with 22 additions and 0 deletions

View file

@ -0,0 +1,7 @@
# frozen_string_literal: true
class Api::V1::InstancesController < ApiController
respond_to :json
def show; end
end

View file

@ -0,0 +1,6 @@
object false
node(:uri) { Rails.configuration.x.local_domain }
node(:title) { Setting.site_title }
node(:description) { Setting.site_description }
node(:email) { Setting.site_contact_email }

View file

@ -131,6 +131,8 @@ Rails.application.routes.draw do
resources :favourites, only: [:index]
resources :reports, only: [:index, :create]
resource :instance, only: [:show]
resources :follow_requests, only: [:index] do
member do
post :authorize

View file

@ -19,6 +19,7 @@ API overview
- Who reblogged/favourited a status
- Following/unfollowing accounts
- Blocking/unblocking accounts
- Getting instance information
- Creating OAuth apps
- [Entities](#entities)
- Status
@ -226,6 +227,12 @@ Returns the updated relationship to the user.
Returns the updated relationship to the user.
### Getting instance information
**GET /api/v1/instance**
Returns an object containing the `title`, `description`, `email` and `uri` of the instance. Does not require authentication.
# Muting and unmuting users
**POST /api/v1/accounts/:id/mute**