-
-
Notifications
You must be signed in to change notification settings - Fork 6.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add backend support for bookmarks Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter. * Add spec for bookmark endpoints * Add front-end support for bookmarks * Introduce OAuth scopes for bookmarks * Add bookmarks to archive takeout * Fix migration * Coding style fixes * Fix rebase issue * Update bookmarked_statuses to latest UI changes * Update bookmark actions to properly reflect status changes in state * Add bookmarks item to single-column layout * Make active bookmarks red
- Loading branch information
1 parent
afb398b
commit dfea736
Showing
33 changed files
with
712 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
# frozen_string_literal: true | ||
|
||
class Api::V1::BookmarksController < Api::BaseController | ||
before_action -> { doorkeeper_authorize! :read, :'read:bookmarks' } | ||
before_action :require_user! | ||
after_action :insert_pagination_headers | ||
|
||
respond_to :json | ||
|
||
def index | ||
@statuses = load_statuses | ||
render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id) | ||
end | ||
|
||
private | ||
|
||
def load_statuses | ||
cached_bookmarks | ||
end | ||
|
||
def cached_bookmarks | ||
cache_collection( | ||
Status.reorder(nil).joins(:bookmarks).merge(results), | ||
Status | ||
) | ||
end | ||
|
||
def results | ||
@_results ||= account_bookmarks.paginate_by_max_id( | ||
limit_param(DEFAULT_STATUSES_LIMIT), | ||
params[:max_id], | ||
params[:since_id] | ||
) | ||
end | ||
|
||
def account_bookmarks | ||
current_account.bookmarks | ||
end | ||
|
||
def insert_pagination_headers | ||
set_pagination_headers(next_path, prev_path) | ||
end | ||
|
||
def next_path | ||
api_v1_bookmarks_url pagination_params(max_id: pagination_max_id) if records_continue? | ||
end | ||
|
||
def prev_path | ||
api_v1_bookmarks_url pagination_params(since_id: pagination_since_id) unless results.empty? | ||
end | ||
|
||
def pagination_max_id | ||
results.last.id | ||
end | ||
|
||
def pagination_since_id | ||
results.first.id | ||
end | ||
|
||
def records_continue? | ||
results.size == limit_param(DEFAULT_STATUSES_LIMIT) | ||
end | ||
|
||
def pagination_params(core_params) | ||
params.slice(:limit).permit(:limit).merge(core_params) | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# frozen_string_literal: true | ||
|
||
class Api::V1::Statuses::BookmarksController < Api::BaseController | ||
include Authorization | ||
|
||
before_action -> { doorkeeper_authorize! :write, :'write:bookmarks' } | ||
before_action :require_user! | ||
|
||
respond_to :json | ||
|
||
def create | ||
@status = bookmarked_status | ||
render json: @status, serializer: REST::StatusSerializer | ||
end | ||
|
||
def destroy | ||
@status = requested_status | ||
@bookmarks_map = { @status.id => false } | ||
|
||
bookmark = Bookmark.find_by!(account: current_user.account, status: @status) | ||
bookmark.destroy! | ||
|
||
render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, bookmarks_map: @bookmarks_map) | ||
end | ||
|
||
private | ||
|
||
def bookmarked_status | ||
authorize_with current_user.account, requested_status, :show? | ||
|
||
bookmark = Bookmark.find_or_create_by!(account: current_user.account, status: requested_status) | ||
|
||
bookmark.status.reload | ||
end | ||
|
||
def requested_status | ||
Status.find(params[:status_id]) | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
import api, { getLinks } from '../api'; | ||
import { importFetchedStatuses } from './importer'; | ||
|
||
export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST'; | ||
export const BOOKMARKED_STATUSES_FETCH_SUCCESS = 'BOOKMARKED_STATUSES_FETCH_SUCCESS'; | ||
export const BOOKMARKED_STATUSES_FETCH_FAIL = 'BOOKMARKED_STATUSES_FETCH_FAIL'; | ||
|
||
export const BOOKMARKED_STATUSES_EXPAND_REQUEST = 'BOOKMARKED_STATUSES_EXPAND_REQUEST'; | ||
export const BOOKMARKED_STATUSES_EXPAND_SUCCESS = 'BOOKMARKED_STATUSES_EXPAND_SUCCESS'; | ||
export const BOOKMARKED_STATUSES_EXPAND_FAIL = 'BOOKMARKED_STATUSES_EXPAND_FAIL'; | ||
|
||
export function fetchBookmarkedStatuses() { | ||
return (dispatch, getState) => { | ||
if (getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) { | ||
return; | ||
} | ||
|
||
dispatch(fetchBookmarkedStatusesRequest()); | ||
|
||
api(getState).get('/api/v1/bookmarks').then(response => { | ||
const next = getLinks(response).refs.find(link => link.rel === 'next'); | ||
dispatch(importFetchedStatuses(response.data)); | ||
dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null)); | ||
}).catch(error => { | ||
dispatch(fetchBookmarkedStatusesFail(error)); | ||
}); | ||
}; | ||
}; | ||
|
||
export function fetchBookmarkedStatusesRequest() { | ||
return { | ||
type: BOOKMARKED_STATUSES_FETCH_REQUEST, | ||
}; | ||
}; | ||
|
||
export function fetchBookmarkedStatusesSuccess(statuses, next) { | ||
return { | ||
type: BOOKMARKED_STATUSES_FETCH_SUCCESS, | ||
statuses, | ||
next, | ||
}; | ||
}; | ||
|
||
export function fetchBookmarkedStatusesFail(error) { | ||
return { | ||
type: BOOKMARKED_STATUSES_FETCH_FAIL, | ||
error, | ||
}; | ||
}; | ||
|
||
export function expandBookmarkedStatuses() { | ||
return (dispatch, getState) => { | ||
const url = getState().getIn(['status_lists', 'bookmarks', 'next'], null); | ||
|
||
if (url === null || getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) { | ||
return; | ||
} | ||
|
||
dispatch(expandBookmarkedStatusesRequest()); | ||
|
||
api(getState).get(url).then(response => { | ||
const next = getLinks(response).refs.find(link => link.rel === 'next'); | ||
dispatch(importFetchedStatuses(response.data)); | ||
dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null)); | ||
}).catch(error => { | ||
dispatch(expandBookmarkedStatusesFail(error)); | ||
}); | ||
}; | ||
}; | ||
|
||
export function expandBookmarkedStatusesRequest() { | ||
return { | ||
type: BOOKMARKED_STATUSES_EXPAND_REQUEST, | ||
}; | ||
}; | ||
|
||
export function expandBookmarkedStatusesSuccess(statuses, next) { | ||
return { | ||
type: BOOKMARKED_STATUSES_EXPAND_SUCCESS, | ||
statuses, | ||
next, | ||
}; | ||
}; | ||
|
||
export function expandBookmarkedStatusesFail(error) { | ||
return { | ||
type: BOOKMARKED_STATUSES_EXPAND_FAIL, | ||
error, | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.