Browse Source

Replace logo, fix #57 - delete/unreblog/unfavourite API, fix #45 - app

registration API
pull/4/head
Eugen Rochko 6 years ago
parent
commit
7e14eefc81
27 changed files with 216 additions and 136 deletions
  1. BIN
     
  2. +20
    -0
      app/assets/javascripts/components/actions/interactions.jsx
  3. +20
    -62
      app/assets/stylesheets/application.scss
  4. +13
    -0
      app/controllers/api/apps_controller.rb
  5. +17
    -0
      app/controllers/api/statuses_controller.rb
  6. +4
    -0
      app/controllers/api_controller.rb
  7. +6
    -0
      app/controllers/auth/sessions_controller.rb
  8. +1
    -1
      app/controllers/home_controller.rb
  9. +0
    -18
      app/controllers/oauth/applications_controller.rb
  10. +2
    -0
      app/helpers/api/apps_helper.rb
  11. +0
    -2
      app/helpers/oauth/applications_helper.rb
  12. +12
    -0
      app/services/unfavourite_service.rb
  13. +4
    -0
      app/views/api/apps/create.rabl
  14. +0
    -11
      app/views/application/_logo.html.erb
  15. +1
    -1
      app/views/layouts/auth.html.haml
  16. +0
    -6
      config/application.rb
  17. +1
    -1
      config/initializers/doorkeeper.rb
  18. +7
    -6
      config/routes.rb
  19. +7
    -0
      db/migrate/20160926213048_remove_owner_from_application.rb
  20. +1
    -4
      db/schema.rb
  21. BIN
     
  22. +26
    -0
      spec/controllers/api/apps_controller_spec.rb
  23. +58
    -0
      spec/controllers/api/statuses_controller_spec.rb
  24. +1
    -1
      spec/controllers/auth/sessions_controller_spec.rb
  25. +0
    -18
      spec/controllers/oauth/applications_controller_spec.rb
  26. +15
    -0
      spec/helpers/api/apps_helper_spec.rb
  27. +0
    -5
      spec/helpers/oauth/applications_helper_spec.rb

BIN
View File


+ 20
- 0
app/assets/javascripts/components/actions/interactions.jsx View File

@ -22,6 +22,16 @@ export function reblog(status) {
};
};
export function unreblog(status) {
return (dispatch, getState) => {
api(getState).post(`/api/statuses/${status.get('id')}/unreblog`).then(response => {
//
}).catch(error => {
//
});
};
};
export function reblogRequest(status) {
return {
type: REBLOG_REQUEST,
@ -57,6 +67,16 @@ export function favourite(status) {
};
};
export function unfavourite(status) {
return (dispatch, getState) => {
api(getState).post(`/api/statuses/${status.get('id')}/unfavourite`).then(response => {
//
}).catch(error => {
//
});
};
};
export function favouriteRequest(status) {
return {
type: FAVOURITE_REQUEST,

+ 20
- 62
app/assets/stylesheets/application.scss View File

@ -59,7 +59,7 @@ table {
body {
font-family: 'Roboto', sans-serif;
background: #282c37 image-url('background-photo.jpeg');
background: #282c37 image-url('background-photo.jpg');
background-size: cover;
background-attachment: fixed;
font-size: 13px;
@ -104,10 +104,29 @@ body {
font-size: 48px;
font-weight: 500;
img {
display: block;
margin: 20px auto;
width: 180px;
height: 180px;
}
a {
color: inherit;
text-decoration: none;
outline: 0;
img {
opacity: 0.8;
transition: all 0.8s ease;
}
&:hover {
img {
opacity: 1;
transition-duration: 0.2s;
}
}
}
small {
@ -313,67 +332,6 @@ body {
}
}
.turbolinks-progress-bar {
background-color: #2b90d9;
}
.mastodon {
$head: #282c37;
$tusk: #d9e1e8;
$backdrop: #2b90d9;
$highlight: 18%;
.mastodon-backdrop {
fill: $backdrop;
}
#mastodon-ear {
fill: lighten($head, 5%);
&:hover, &.highlight {
fill: lighten($head, $highlight);
}
}
#mastodon-head-backdrop {
fill: darken($head, 5%);
&:hover, &.highlight {
fill: darken($head, 5%);
}
}
#mastodon-nose, #mastodon-cheek, #mastodon-forehead, #mastodon-backhead {
fill: $head;
&:hover, &.highlight {
fill: lighten($head, $highlight);
}
}
#mastodon-tusk-front {
fill: lighten($tusk, 5%);
}
#mastodon-tusk-back {
fill: $tusk;
&:hover, &.highlight {
fill: lighten($tusk, $highlight);
}
}
.mastodon-shape {
transition: all 0.8s ease;
stroke: transparent;
stroke-width: 0px;
&:hover, &.highlight {
transition-duration: 0.2s;
}
}
}
@import 'accounts';
@import 'stream_entries';
@import 'components'

+ 13
- 0
app/controllers/api/apps_controller.rb View File

@ -0,0 +1,13 @@
class Api::AppsController < ApplicationController
respond_to :json
def create
@app = Doorkeeper::Application.create!(app_params)
end
private
def app_params
params.permit(:name, :redirect_uri)
end
end

+ 17
- 0
app/controllers/api/statuses_controller.rb View File

@ -17,16 +17,33 @@ class Api::StatusesController < ApiController
render action: :show
end
def destroy
@status = Status.where(account_id: current_user.account).find(params[:id])
RemoveStatusService.new.(@status)
render_empty
end
def reblog
@status = ReblogService.new.(current_user.account, Status.find(params[:id])).reload
render action: :show
end
def unreblog
RemoveStatusService.new.(Status.where(account_id: current_user.account, reblog_of_id: params[:id]).first!)
@status = Status.find(params[:id])
render action: :show
end
def favourite
@status = FavouriteService.new.(current_user.account, Status.find(params[:id])).status.reload
render action: :show
end
def unfavourite
@status = UnfavouriteService.new.(current_user.account, Status.find(params[:id])).status.reload
render action: :show
end
def home
@statuses = Feed.new(:home, current_user.account).get(20, params[:max_id]).to_a
end

+ 4
- 0
app/controllers/api_controller.rb View File

@ -27,4 +27,8 @@ class ApiController < ApplicationController
def current_user
super || current_resource_owner
end
def render_empty
render json: {}, status: 200
end
end

+ 6
- 0
app/controllers/auth/sessions_controller.rb View File

@ -8,4 +8,10 @@ class Auth::SessionsController < Devise::SessionsController
remember_me(resource)
end
end
protected
def after_sign_in_path_for(_resource)
root_path
end
end

+ 1
- 1
app/controllers/home_controller.rb View File

@ -7,7 +7,7 @@ class HomeController < ApplicationController
@mentions = Feed.new(:mentions, current_user.account).get(20)
@token = find_or_create_access_token.token
end
private
def find_or_create_access_token

+ 0
- 18
app/controllers/oauth/applications_controller.rb View File

@ -1,18 +0,0 @@
class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
before_action :authenticate_user!
def index
@applications = current_user.oauth_applications
end
def create
@application = Doorkeeper::Application.new(application_params)
@application.owner = current_user
if @application.save
redirect_to oauth_application_url(@application)
else
render :new
end
end
end

+ 2
- 0
app/helpers/api/apps_helper.rb View File

@ -0,0 +1,2 @@
module Api::AppsHelper
end

+ 0
- 2
app/helpers/oauth/applications_helper.rb View File

@ -1,2 +0,0 @@
module Oauth::ApplicationsHelper
end

+ 12
- 0
app/services/unfavourite_service.rb View File

@ -0,0 +1,12 @@
class UnfavouriteService < BaseService
def call(account, status)
favourite = Favourite.find_by!(account: account, status: status)
favourite.destroy!
unless status.local?
NotificationWorker.perform_async(favourite.stream_entry.id, status.account_id)
end
favourite
end
end

+ 4
- 0
app/views/api/apps/create.rabl View File

@ -0,0 +1,4 @@
object @app
attributes :id, :redirect_uri
node(:client_id) { |app| app.uid }
node(:client_secret) { |app| app.secret }

+ 0
- 11
app/views/application/_logo.html.erb View File

@ -1,11 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="<%= dim %>" height="<%= dim %>" class="mastodon" viewBox="-100 0 1390 750">
<circle cx="600" cy="380" r="500" fill="#9baec8" class="mastodon-backdrop"/>
<path fill="#282c37" d="M500 200l130-60h140l160 130-90 160-250 45-150-24-26 56 16 83h60l10 40-50 50-80-40-60-160 90-180" class="mastodon-shape" id="mastodon-head-backdrop"/>
<path fill="#282c37" d="M442.1204 451.3337l-42.08-151.3737-.0425.0424-89.993 180.007 60.002 159.9848 80.003 40.0015 49.9913-49.9913-10.011-40.0015h-59.981l-16.0134-82.994 26.003-56.015 2.121.3393z" class="mastodon-shape" id="mastodon-nose"/>
<path fill="#282c37" d="M498.2625 201.7378L400.0403 299.96l42.08 151.3737 147.8742 23.67.5515-.106-92.2835-273.16z" class="mastodon-shape" id="mastodon-cheek"/>
<path fill="#282c37" d="M498.2625 201.7378l92.2835 273.16.7635-.1273L770.0862 140.06l-.0848-.0637H629.996l-129.9943 60.0023-1.7392 1.7392z" class="mastodon-shape" id="mastodon-forehead"/>
<path fill="#282c37" d="M770.0862 140.06L591.3095 474.7705l248.684-44.7737 90.014-160.006L770.0862 140.06z" class="mastodon-shape" id="mastodon-backhead"/>
<path fill="#fff" d="M440 450l-40 80-170-20L70 390-80 230 0 390l100 100 120 100 120 20h130l90-140" class="mastodon-shape" id="mastodon-tusk-front"/>
<path fill="#d9e1e8" d="M268 516L120 360 80 260l70 90 110 90 59 22-8 18 15 41" class="mastodon-shape" id="mastodon-tusk-back"/>
<path fill="#282c37" d="M780 190l110 80-80 140-40-80" class="mastodon-shape" id="mastodon-ear"/>
</svg>

+ 1
- 1
app/views/layouts/auth.html.haml View File

@ -3,7 +3,7 @@
.logo-container
%h1
= link_to root_path do
= render partial: 'application/logo', locals: { dim: 200 }
= image_tag 'logo.png'
%small= Rails.configuration.x.local_domain
.form-container

+ 0
- 6
config/application.rb View File

@ -27,12 +27,6 @@ module Mastodon
config.active_job.queue_adapter = :sidekiq
config.to_prepare do
# Doorkeeper::ApplicationsController.layout 'dashboard'
# Doorkeeper::AuthorizedApplicationsController.layout 'dashboard'
Doorkeeper::AuthorizationsController.layout 'auth'
end
config.middleware.use Rack::Attack
config.middleware.use Rack::Deflater

+ 1
- 1
config/initializers/doorkeeper.rb View File

@ -45,7 +45,7 @@ Doorkeeper.configure do
# Optional parameter :confirmation => true (default false) if you want to enforce ownership of
# a registered application
# Note: you must also run the rails g doorkeeper:application_owner generator to provide the necessary support
enable_application_owner :confirmation => true
# enable_application_owner :confirmation => true
# Define access token scopes for your provider
# For more information go to

+ 7
- 6
config/routes.rb View File

@ -7,9 +7,7 @@ Rails.application.routes.draw do
mount Sidekiq::Web => '/sidekiq'
end
use_doorkeeper do
controllers applications: 'oauth/applications'
end
use_doorkeeper
get '.well-known/host-meta', to: 'xrd#host_meta', as: :host_meta
get '.well-known/webfinger', to: 'xrd#webfinger', as: :webfinger
@ -31,7 +29,7 @@ Rails.application.routes.draw do
resource :settings, only: [:show, :update]
resources :media, only: [:show]
namespace :api do
# PubSubHubbub
resources :subscriptions, only: [:show]
@ -41,7 +39,7 @@ Rails.application.routes.draw do
post '/salmon/:id', to: 'salmon#update', as: :salmon
# JSON / REST API
resources :statuses, only: [:create, :show] do
resources :statuses, only: [:create, :show, :destroy] do
collection do
get :home
get :mentions
@ -51,13 +49,16 @@ Rails.application.routes.draw do
get :context
post :reblog
post :unreblog
post :favourite
post :unfavourite
end
end
resources :follows, only: [:create]
resources :media, only: [:create]
resources :apps, only: [:create]
resources :accounts, only: [:show] do
collection do
get :relationships

+ 7
- 0
db/migrate/20160926213048_remove_owner_from_application.rb View File

@ -0,0 +1,7 @@
class RemoveOwnerFromApplication < ActiveRecord::Migration[5.0]
def change
remove_index :oauth_applications, [:owner_id, :owner_type]
remove_column :oauth_applications, :owner_id, :integer, null: true
remove_column :oauth_applications, :owner_type, :string, null: true
end
end

+ 1
- 4
db/schema.rb View File

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160920003904) do
ActiveRecord::Schema.define(version: 20160926213048) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -114,10 +114,7 @@ ActiveRecord::Schema.define(version: 20160920003904) do
t.string "scopes", default: "", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "owner_id"
t.string "owner_type"
t.boolean "superapp", default: false, null: false
t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
end

BIN
View File


+ 26
- 0
spec/controllers/api/apps_controller_spec.rb View File

@ -0,0 +1,26 @@
require 'rails_helper'
RSpec.describe Api::AppsController, type: :controller do
render_views
describe 'POST #create' do
before do
post :create, params: { name: 'Test app', redirect_uri: 'urn:ietf:wg:oauth:2.0:oob' }
end
it 'returns http success' do
expect(response).to have_http_status(:success)
end
it 'creates an OAuth app' do
expect(Doorkeeper::Application.find_by(name: 'Test app')).to_not be nil
end
it 'returns client ID and client secret' do
json = body_as_json
expect(json[:client_id]).to_not be_blank
expect(json[:client_secret]).to_not be_blank
end
end
end

+ 58
- 0
spec/controllers/api/statuses_controller_spec.rb View File

@ -57,6 +57,22 @@ RSpec.describe Api::StatusesController, type: :controller do
end
end
describe 'DELETE #destroy' do
let(:status) { Fabricate(:status, account: user.account) }
before do
post :destroy, params: { id: status.id }
end
it 'returns http success' do
expect(response).to have_http_status(:success)
end
it 'removes the status' do
expect(Status.find_by(id: status.id)).to be nil
end
end
describe 'POST #reblog' do
let(:status) { Fabricate(:status, account: user.account) }
@ -85,6 +101,27 @@ RSpec.describe Api::StatusesController, type: :controller do
end
end
describe 'POST #unreblog' do
let(:status) { Fabricate(:status, account: user.account) }
before do
post :reblog, params: { id: status.id }
post :unreblog, params: { id: status.id }
end
it 'returns http success' do
expect(response).to have_http_status(:success)
end
it 'updates the reblogs count' do
expect(status.reblogs_count).to eq 0
end
it 'updates the reblogged attribute' do
expect(user.account.reblogged?(status)).to be false
end
end
describe 'POST #favourite' do
let(:status) { Fabricate(:status, account: user.account) }
@ -112,4 +149,25 @@ RSpec.describe Api::StatusesController, type: :controller do
expect(hash_body[:favourited]).to be true
end
end
describe 'POST #unfavourite' do
let(:status) { Fabricate(:status, account: user.account) }
before do
post :favourite, params: { id: status.id }
post :unfavourite, params: { id: status.id }
end
it 'returns http success' do
expect(response).to have_http_status(:success)
end
it 'updates the favourites count' do
expect(status.favourites_count).to eq 0
end
it 'updates the favourited attribute' do
expect(user.account.favourited?(status)).to be false
end
end
end

+ 1
- 1
spec/controllers/auth/sessions_controller_spec.rb View File

@ -20,7 +20,7 @@ RSpec.describe Auth::SessionsController, type: :controller do
post :create, params: { user: { email: user.email, password: user.password } }
end
it 'redirects to home page' do
it 'redirects to home' do
expect(response).to redirect_to(root_path)
end

+ 0
- 18
spec/controllers/oauth/applications_controller_spec.rb View File

@ -1,18 +0,0 @@
require 'rails_helper'
RSpec.describe Oauth::ApplicationsController, type: :controller do
before do
sign_in Fabricate(:user), scope: :user
end
describe 'GET #index' do
it 'returns http success' do
get :index
expect(response).to have_http_status(:success)
end
end
describe 'POST #create' do
it 'redirects to the application page'
end
end

+ 15
- 0
spec/helpers/api/apps_helper_spec.rb View File

@ -0,0 +1,15 @@
require 'rails_helper'
# Specs in this file have access to a helper object that includes
# the Api::AppsHelper. For example:
#
# describe Api::AppsHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# expect(helper.concat_strings("this","that")).to eq("this that")
# end
# end
# end
RSpec.describe Api::AppsHelper, type: :helper do
pending "add some examples to (or delete) #{__FILE__}"
end

+ 0
- 5
spec/helpers/oauth/applications_helper_spec.rb View File

@ -1,5 +0,0 @@
require 'rails_helper'
RSpec.describe Oauth::ApplicationsHelper, type: :helper do
end

Loading…
Cancel
Save