--- /dev/null
+# 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
--- /dev/null
+# 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
--- /dev/null
+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,
+ };
+};
export const UNPIN_SUCCESS = 'UNPIN_SUCCESS';
export const UNPIN_FAIL = 'UNPIN_FAIL';
+export const BOOKMARK_REQUEST = 'BOOKMARK_REQUEST';
+export const BOOKMARK_SUCCESS = 'BOOKMARKED_SUCCESS';
+export const BOOKMARK_FAIL = 'BOOKMARKED_FAIL';
+
+export const UNBOOKMARK_REQUEST = 'UNBOOKMARKED_REQUEST';
+export const UNBOOKMARK_SUCCESS = 'UNBOOKMARKED_SUCCESS';
+export const UNBOOKMARK_FAIL = 'UNBOOKMARKED_FAIL';
+
export function reblog(status) {
return function (dispatch, getState) {
dispatch(reblogRequest(status));
};
};
+export function bookmark(status) {
+ return function (dispatch, getState) {
+ dispatch(bookmarkRequest(status));
+
+ api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function (response) {
+ dispatch(importFetchedStatus(response.data));
+ dispatch(bookmarkSuccess(status, response.data));
+ }).catch(function (error) {
+ dispatch(bookmarkFail(status, error));
+ });
+ };
+};
+
+export function unbookmark(status) {
+ return (dispatch, getState) => {
+ dispatch(unbookmarkRequest(status));
+
+ api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
+ dispatch(importFetchedStatus(response.data));
+ dispatch(unbookmarkSuccess(status, response.data));
+ }).catch(error => {
+ dispatch(unbookmarkFail(status, error));
+ });
+ };
+};
+
+export function bookmarkRequest(status) {
+ return {
+ type: BOOKMARK_REQUEST,
+ status: status,
+ };
+};
+
+export function bookmarkSuccess(status, response) {
+ return {
+ type: BOOKMARK_SUCCESS,
+ status: status,
+ response: response,
+ };
+};
+
+export function bookmarkFail(status, error) {
+ return {
+ type: BOOKMARK_FAIL,
+ status: status,
+ error: error,
+ };
+};
+
+export function unbookmarkRequest(status) {
+ return {
+ type: UNBOOKMARK_REQUEST,
+ status: status,
+ };
+};
+
+export function unbookmarkSuccess(status, response) {
+ return {
+ type: UNBOOKMARK_SUCCESS,
+ status: status,
+ response: response,
+ };
+};
+
+export function unbookmarkFail(status, error) {
+ return {
+ type: UNBOOKMARK_FAIL,
+ status: status,
+ error: error,
+ };
+};
+
export function fetchReblogs(id) {
return (dispatch, getState) => {
dispatch(fetchReblogsRequest(id));
cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
+ bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
open: { id: 'status.open', defaultMessage: 'Expand this status' },
report: { id: 'status.report', defaultMessage: 'Report @{name}' },
muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
onEmbed: PropTypes.func,
onMuteConversation: PropTypes.func,
onPin: PropTypes.func,
+ onBookmark: PropTypes.func,
withDismiss: PropTypes.bool,
intl: PropTypes.object.isRequired,
};
window.open(`/interact/${this.props.status.get('id')}?type=${type}`, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
}
+ handleBookmarkClick = () => {
+ this.props.onBookmark(this.props.status);
+ }
+
handleDeleteClick = () => {
this.props.onDelete(this.props.status, this.context.router.history);
}
<IconButton className='status__action-bar-button' disabled={!publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
{shareButton}
+ <IconButton className='status__action-bar-button bookmark-icon' disabled={anonymousAccess} active={status.get('bookmarked')} pressed={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
<div className='status__action-bar-dropdown'>
<DropdownMenuContainer disabled={anonymousAccess} status={status} items={menu} icon='ellipsis-h' size={18} direction='right' title={intl.formatMessage(messages.more)} />
import {
reblog,
favourite,
+ bookmark,
unreblog,
unfavourite,
+ unbookmark,
pin,
unpin,
} from '../actions/interactions';
}
},
+ onBookmark (status) {
+ if (status.get('bookmarked')) {
+ dispatch(unbookmark(status));
+ } else {
+ dispatch(bookmark(status));
+ }
+ },
+
onPin (status) {
if (status.get('pinned')) {
dispatch(unpin(status));
--- /dev/null
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from '../../actions/bookmarks';
+import Column from '../ui/components/column';
+import ColumnHeader from '../../components/column_header';
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import StatusList from '../../components/status_list';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { debounce } from 'lodash';
+
+const messages = defineMessages({
+ heading: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' },
+});
+
+const mapStateToProps = state => ({
+ statusIds: state.getIn(['status_lists', 'bookmarks', 'items']),
+ isLoading: state.getIn(['status_lists', 'bookmarks', 'isLoading'], true),
+ hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
+});
+
+export default @connect(mapStateToProps)
+@injectIntl
+class Bookmarks extends ImmutablePureComponent {
+
+ static propTypes = {
+ dispatch: PropTypes.func.isRequired,
+ shouldUpdateScroll: PropTypes.func,
+ statusIds: ImmutablePropTypes.list.isRequired,
+ intl: PropTypes.object.isRequired,
+ columnId: PropTypes.string,
+ multiColumn: PropTypes.bool,
+ hasMore: PropTypes.bool,
+ isLoading: PropTypes.bool,
+ };
+
+ componentWillMount () {
+ this.props.dispatch(fetchBookmarkedStatuses());
+ }
+
+ handlePin = () => {
+ const { columnId, dispatch } = this.props;
+
+ if (columnId) {
+ dispatch(removeColumn(columnId));
+ } else {
+ dispatch(addColumn('BOOKMARKS', {}));
+ }
+ }
+
+ handleMove = (dir) => {
+ const { columnId, dispatch } = this.props;
+ dispatch(moveColumn(columnId, dir));
+ }
+
+ handleHeaderClick = () => {
+ this.column.scrollTop();
+ }
+
+ setRef = c => {
+ this.column = c;
+ }
+
+ handleLoadMore = debounce(() => {
+ this.props.dispatch(expandBookmarkedStatuses());
+ }, 300, { leading: true })
+
+ render () {
+ const { intl, shouldUpdateScroll, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
+ const pinned = !!columnId;
+
+ const emptyMessage = <FormattedMessage id='empty_column.bookmarked_statuses' defaultMessage="You don't have any bookmarked toots yet. When you bookmark one, it will show up here." />;
+
+ return (
+ <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.heading)}>
+ <ColumnHeader
+ icon='bookmark'
+ title={intl.formatMessage(messages.heading)}
+ onPin={this.handlePin}
+ onMove={this.handleMove}
+ onClick={this.handleHeaderClick}
+ pinned={pinned}
+ multiColumn={multiColumn}
+ showBackButton
+ />
+
+ <StatusList
+ trackScroll={!pinned}
+ statusIds={statusIds}
+ scrollKey={`bookmarked_statuses-${columnId}`}
+ hasMore={hasMore}
+ isLoading={isLoading}
+ onLoadMore={this.handleLoadMore}
+ shouldUpdateScroll={shouldUpdateScroll}
+ emptyMessage={emptyMessage}
+ bindToDocument={!multiColumn}
+ />
+ </Column>
+ );
+ }
+
+}
settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
+ bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
navItems.push(
<ColumnLink key={i++} icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
+ <ColumnLink key={i++} icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
<ColumnLink key={i++} icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
<ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />
);
- height += 48*3;
+ height += 48*4;
if (myAccount.get('locked') || unreadFollowRequests > 0) {
navItems.push(<ColumnLink key={i++} icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
+ bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
mute: { id: 'status.mute', defaultMessage: 'Mute @{name}' },
muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
onReply: PropTypes.func.isRequired,
onReblog: PropTypes.func.isRequired,
onFavourite: PropTypes.func.isRequired,
+ onBookmark: PropTypes.func.isRequired,
onDelete: PropTypes.func.isRequired,
onDirect: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired,
this.props.onFavourite(this.props.status);
}
+ handleBookmarkClick = (e) => {
+ this.props.onBookmark(this.props.status, e);
+ }
+
handleDeleteClick = () => {
this.props.onDelete(this.props.status, this.context.router.history);
}
<div className='detailed-status__button'><IconButton disabled={reblog_disabled} active={status.get('reblogged')} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div>
<div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
{shareButton}
+ <div className='detailed-status__button'><IconButton className='bookmark-icon' active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} /></div>
<div className='detailed-status__action-bar-dropdown'>
<DropdownMenuContainer size={18} icon='ellipsis-h' items={menu} direction='left' title='More' />
import {
favourite,
unfavourite,
+ bookmark,
+ unbookmark,
reblog,
unreblog,
pin,
}
}
+ handleBookmarkClick = (status) => {
+ if (status.get('bookmarked')) {
+ this.props.dispatch(unbookmark(status));
+ } else {
+ this.props.dispatch(bookmark(status));
+ }
+ }
+
handleDeleteClick = (status, history, withRedraft = false) => {
const { dispatch, intl } = this.props;
onReply={this.handleReplyClick}
onFavourite={this.handleFavouriteClick}
onReblog={this.handleReblogClick}
+ onBookmark={this.handleBookmarkClick}
onDelete={this.handleDeleteClick}
onDirect={this.handleDirectClick}
onMention={this.handleMentionClick}
HashtagTimeline,
DirectTimeline,
FavouritedStatuses,
+ BookmarkedStatuses,
ListTimeline,
Directory,
} from '../../ui/util/async-components';
'HASHTAG': HashtagTimeline,
'DIRECT': DirectTimeline,
'FAVOURITES': FavouritedStatuses,
+ 'BOOKMARKS': BookmarkedStatuses,
'LIST': ListTimeline,
'DIRECTORY': Directory,
};
<NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
<NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
<NavLink className='column-link column-link--transparent' to='/favourites'><Icon className='column-link__icon' id='star' fixedWidth /><FormattedMessage id='navigation_bar.favourites' defaultMessage='Favourites' /></NavLink>
+ <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
<NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
{profile_directory && <NavLink className='column-link column-link--transparent' to='/directory'><Icon className='column-link__icon' id='address-book-o' fixedWidth /><FormattedMessage id='getting_started.directory' defaultMessage='Profile directory' /></NavLink>}
FollowRequests,
GenericNotFound,
FavouritedStatuses,
+ BookmarkedStatuses,
ListTimeline,
Blocks,
DomainBlocks,
<WrappedRoute path='/notifications' component={Notifications} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
<WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+ <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
<WrappedRoute path='/pinned' component={PinnedStatuses} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
<WrappedRoute path='/search' component={Search} content={children} />
return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited_statuses');
}
+export function BookmarkedStatuses () {
+ return import(/* webpackChunkName: "features/bookmarked_statuses" */'../../bookmarked_statuses');
+}
+
export function Blocks () {
return import(/* webpackChunkName: "features/blocks" */'../../blocks');
}
FAVOURITED_STATUSES_EXPAND_SUCCESS,
FAVOURITED_STATUSES_EXPAND_FAIL,
} from '../actions/favourites';
+import {
+ BOOKMARKED_STATUSES_FETCH_REQUEST,
+ BOOKMARKED_STATUSES_FETCH_SUCCESS,
+ BOOKMARKED_STATUSES_FETCH_FAIL,
+ BOOKMARKED_STATUSES_EXPAND_REQUEST,
+ BOOKMARKED_STATUSES_EXPAND_SUCCESS,
+ BOOKMARKED_STATUSES_EXPAND_FAIL,
+} from '../actions/bookmarks';
import {
PINNED_STATUSES_FETCH_SUCCESS,
} from '../actions/pin_statuses';
import {
FAVOURITE_SUCCESS,
UNFAVOURITE_SUCCESS,
+ BOOKMARK_SUCCESS,
+ UNBOOKMARK_SUCCESS,
PIN_SUCCESS,
UNPIN_SUCCESS,
} from '../actions/interactions';
loaded: false,
items: ImmutableList(),
}),
+ bookmarks: ImmutableMap({
+ next: null,
+ loaded: false,
+ items: ImmutableList(),
+ }),
pins: ImmutableMap({
next: null,
loaded: false,
return normalizeList(state, 'favourites', action.statuses, action.next);
case FAVOURITED_STATUSES_EXPAND_SUCCESS:
return appendToList(state, 'favourites', action.statuses, action.next);
+ case BOOKMARKED_STATUSES_FETCH_REQUEST:
+ case BOOKMARKED_STATUSES_EXPAND_REQUEST:
+ return state.setIn(['bookmarks', 'isLoading'], true);
+ case BOOKMARKED_STATUSES_FETCH_FAIL:
+ case BOOKMARKED_STATUSES_EXPAND_FAIL:
+ return state.setIn(['bookmarks', 'isLoading'], false);
+ case BOOKMARKED_STATUSES_FETCH_SUCCESS:
+ return normalizeList(state, 'bookmarks', action.statuses, action.next);
+ case BOOKMARKED_STATUSES_EXPAND_SUCCESS:
+ return appendToList(state, 'bookmarks', action.statuses, action.next);
case FAVOURITE_SUCCESS:
return prependOneToList(state, 'favourites', action.status);
case UNFAVOURITE_SUCCESS:
return removeOneFromList(state, 'favourites', action.status);
+ case BOOKMARK_SUCCESS:
+ return prependOneToList(state, 'bookmarks', action.status);
+ case UNBOOKMARK_SUCCESS:
+ return removeOneFromList(state, 'bookmarks', action.status);
case PINNED_STATUSES_FETCH_SUCCESS:
return normalizeList(state, 'pins', action.statuses, action.next);
case PIN_SUCCESS:
FAVOURITE_REQUEST,
FAVOURITE_FAIL,
UNFAVOURITE_SUCCESS,
+ BOOKMARK_REQUEST,
+ BOOKMARK_FAIL,
} from '../actions/interactions';
import {
STATUS_MUTE_SUCCESS,
return state.setIn([action.status.get('id'), 'favourites_count'], favouritesCount - 1);
case FAVOURITE_FAIL:
return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false);
+ case BOOKMARK_REQUEST:
+ return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], true);
+ case BOOKMARK_FAIL:
+ return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'bookmarked'], false);
case REBLOG_REQUEST:
return state.setIn([action.status.get('id'), 'reblogged'], true);
case REBLOG_FAIL:
color: $gold-star;
}
+.bookmark-icon.active {
+ color: $red-bookmark;
+}
+
.no-reduce-motion .icon-button.star-icon {
&.activate {
& > .fa-star {
$warning-red: #ff5050 !default; // Sunset Orange
$gold-star: #ca8f04 !default; // Dark Goldenrod
+$red-bookmark: $warning-red;
+
// Values from the classic Mastodon UI
$classic-base-color: #282c37; // Midnight Express
$classic-primary-color: #9baec8; // Echo Blue
--- /dev/null
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: bookmarks
+#
+# id :integer not null, primary key
+# created_at :datetime not null
+# updated_at :datetime not null
+# account_id :integer not null
+# status_id :integer not null
+#
+
+class Bookmark < ApplicationRecord
+ include Paginable
+
+ update_index('statuses#status', :status) if Chewy.enabled?
+
+ belongs_to :account, inverse_of: :bookmarks
+ belongs_to :status, inverse_of: :bookmarks
+
+ validates :status_id, uniqueness: { scope: :account_id }
+
+ before_validation do
+ self.status = status.reblog if status&.reblog?
+ end
+end
# Timelines
has_many :statuses, inverse_of: :account, dependent: :destroy
has_many :favourites, inverse_of: :account, dependent: :destroy
+ has_many :bookmarks, inverse_of: :account, dependent: :destroy
has_many :mentions, inverse_of: :account, dependent: :destroy
has_many :notifications, inverse_of: :account, dependent: :destroy
has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
status.proper.favourites.where(account: self).exists?
end
+ def bookmarked?(status)
+ status.proper.bookmarks.where(account: self).exists?
+ end
+
def reblogged?(status)
status.proper.reblogs.where(account: self).exists?
end
belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
has_many :favourites, inverse_of: :status, dependent: :destroy
+ has_many :bookmarks, inverse_of: :status, dependent: :destroy
has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :thread
has_many :mentions, dependent: :destroy, inverse_of: :status
Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |f, h| h[f.status_id] = true }
end
+ def bookmarks_map(status_ids, account_id)
+ Bookmark.select('status_id').where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h
+ end
+
def reblogs_map(status_ids, account_id)
unscoped.select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).each_with_object({}) { |s, h| h[s.reblog_of_id] = true }
end
if current_account_id.nil?
@reblogs_map = {}
@favourites_map = {}
+ @bookmarks_map = {}
@mutes_map = {}
@pins_map = {}
else
@reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
@favourites_map = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})
+ @bookmarks_map = Status.bookmarks_map(status_ids, current_account_id).merge(options[:bookmarks_map] || {})
@mutes_map = Status.mutes_map(conversation_ids, current_account_id).merge(options[:mutes_map] || {})
@pins_map = Status.pins_map(pinnable_status_ids, current_account_id).merge(options[:pins_map] || {})
end
attribute :favourited, if: :current_user?
attribute :reblogged, if: :current_user?
attribute :muted, if: :current_user?
+ attribute :bookmarked, if: :current_user?
attribute :pinned, if: :pinnable?
attribute :content, unless: :source_requested?
end
end
+ def bookmarked
+ if instance_options && instance_options[:bookmarks]
+ instance_options[:bookmarks].bookmarks_map[object.id] || false
+ else
+ current_user.account.bookmarked?(object)
+ end
+ end
+
def pinned
if instance_options && instance_options[:relationships]
instance_options[:relationships].pins_map[object.id] || false
dump_media_attachments!(tar)
dump_outbox!(tar)
dump_likes!(tar)
+ dump_bookmarks!(tar)
dump_actor!(tar)
end
end
actor[:image][:url] = 'header' + File.extname(actor[:image][:url]) if actor[:image]
actor[:outbox] = 'outbox.json'
actor[:likes] = 'likes.json'
+ actor[:bookmarks] = 'bookmarks.json'
download_to_tar(tar, account.avatar, 'avatar' + File.extname(account.avatar.path)) if account.avatar.exists?
download_to_tar(tar, account.header, 'header' + File.extname(account.header.path)) if account.header.exists?
end
end
+ def dump_bookmarks!(tar)
+ collection = serialize(ActivityPub::CollectionPresenter.new(id: 'bookmarks.json', type: :ordered, size: 0, items: []), ActivityPub::CollectionSerializer)
+
+ Status.reorder(nil).joins(:bookmarks).includes(:account).merge(account.bookmarks).find_in_batches do |statuses|
+ statuses.each do |status|
+ collection[:totalItems] += 1
+ collection[:orderedItems] << ActivityPub::TagManager.instance.uri_for(status)
+ end
+
+ GC.start
+ end
+
+ json = Oj.dump(collection)
+
+ tar.add_file_simple('bookmarks.json', 0o444, json.bytesize) do |io|
+ io.write(json)
+ end
+ end
+
def collection_presenter
ActivityPub::CollectionPresenter.new(
id: 'outbox.json',
optional_scopes :write,
:'write:accounts',
:'write:blocks',
+ :'write:bookmarks',
:'write:conversations',
:'write:favourites',
:'write:filters',
:read,
:'read:accounts',
:'read:blocks',
+ :'read:bookmarks',
:'read:favourites',
:'read:filters',
:'read:follows',
read: read all your account's data
read:accounts: see accounts information
read:blocks: see your blocks
+ read:bookmarks: see your bookmarks
read:favourites: see your favourites
read:filters: see your filters
read:follows: see your follows
write: modify all your account's data
write:accounts: modify your profile
write:blocks: block accounts and domains
+ write:bookmarks: bookmark statuses
write:favourites: favourite statuses
write:filters: create filters
write:follows: follow people
resource :favourite, only: :create
post :unfavourite, to: 'favourites#destroy'
+ resource :bookmark, only: :create
+ post :unbookmark, to: 'bookmarks#destroy'
+
resource :mute, only: :create
post :unmute, to: 'mutes#destroy'
resources :blocks, only: [:index]
resources :mutes, only: [:index]
resources :favourites, only: [:index]
+ resources :bookmarks, only: [:index]
resources :reports, only: [:create]
resources :trends, only: [:index]
resources :filters, only: [:index, :create, :show, :update, :destroy]
--- /dev/null
+class CreateBookmarks < ActiveRecord::Migration[5.1]
+ def change
+ create_table :bookmarks do |t|
+ t.references :account, null: false
+ t.references :status, null: false
+
+ t.timestamps
+ end
+
+ safety_assured do
+ add_foreign_key :bookmarks, :accounts, column: :account_id, on_delete: :cascade
+ add_foreign_key :bookmarks, :statuses, column: :status_id, on_delete: :cascade
+ end
+
+ add_index :bookmarks, [:account_id, :status_id], unique: true
+ end
+end
t.index ["target_account_id"], name: "index_blocks_on_target_account_id"
end
+ create_table "bookmarks", force: :cascade do |t|
+ t.bigint "account_id", null: false
+ t.bigint "status_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["account_id", "status_id"], name: "index_bookmarks_on_account_id_and_status_id", unique: true
+ t.index ["account_id"], name: "index_bookmarks_on_account_id"
+ t.index ["status_id"], name: "index_bookmarks_on_status_id"
+ end
+
create_table "conversation_mutes", force: :cascade do |t|
t.bigint "conversation_id", null: false
t.bigint "account_id", null: false
add_foreign_key "backups", "users", on_delete: :nullify
add_foreign_key "blocks", "accounts", column: "target_account_id", name: "fk_9571bfabc1", on_delete: :cascade
add_foreign_key "blocks", "accounts", name: "fk_4269e03e65", on_delete: :cascade
+ add_foreign_key "bookmarks", "accounts", on_delete: :cascade
+ add_foreign_key "bookmarks", "statuses", on_delete: :cascade
add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade
add_foreign_key "conversation_mutes", "conversations", on_delete: :cascade
add_foreign_key "custom_filters", "accounts", on_delete: :cascade
--- /dev/null
+require 'rails_helper'
+
+RSpec.describe Api::V1::BookmarksController, type: :controller do
+ render_views
+
+ let(:user) { Fabricate(:user) }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:bookmarks') }
+
+ describe 'GET #index' do
+ context 'without token' do
+ it 'returns http unauthorized' do
+ get :index
+ expect(response).to have_http_status :unauthorized
+ end
+ end
+
+ context 'with token' do
+ context 'without read scope' do
+ before do
+ allow(controller).to receive(:doorkeeper_token) do
+ Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: '')
+ end
+ end
+
+ it 'returns http forbidden' do
+ get :index
+ expect(response).to have_http_status :forbidden
+ end
+ end
+
+ context 'without valid resource owner' do
+ before do
+ token = Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read')
+ user.destroy!
+
+ allow(controller).to receive(:doorkeeper_token) { token }
+ end
+
+ it 'returns http unprocessable entity' do
+ get :index
+ expect(response).to have_http_status :unprocessable_entity
+ end
+ end
+
+ context 'with read scope and valid resource owner' do
+ before do
+ allow(controller).to receive(:doorkeeper_token) do
+ Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read')
+ end
+ end
+
+ it 'shows bookmarks owned by the user' do
+ bookmarked_by_user = Fabricate(:bookmark, account: user.account)
+ bookmarked_by_others = Fabricate(:bookmark)
+
+ get :index
+
+ expect(assigns(:statuses)).to match_array [bookmarked_by_user.status]
+ end
+
+ it 'adds pagination headers if necessary' do
+ bookmark = Fabricate(:bookmark, account: user.account)
+
+ get :index, params: { limit: 1 }
+
+ expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq "http://test.host/api/v1/bookmarks?limit=1&max_id=#{bookmark.id}"
+ expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq "http://test.host/api/v1/bookmarks?limit=1&since_id=#{bookmark.id}"
+ end
+
+ it 'does not add pagination headers if not necessary' do
+ get :index
+
+ expect(response.headers['Link']).to eq nil
+ end
+ end
+ end
+ end
+end
--- /dev/null
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::V1::Statuses::BookmarksController do
+ render_views
+
+ let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:bookmarks', application: app) }
+
+ context 'with an oauth token' do
+ before do
+ allow(controller).to receive(:doorkeeper_token) { token }
+ end
+
+ describe 'POST #create' do
+ let(:status) { Fabricate(:status, account: user.account) }
+
+ before do
+ post :create, params: { status_id: status.id }
+ end
+
+ it 'returns http success' do
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'updates the bookmarked attribute' do
+ expect(user.account.bookmarked?(status)).to be true
+ end
+
+ it 'return json with updated attributes' do
+ hash_body = body_as_json
+
+ expect(hash_body[:id]).to eq status.id.to_s
+ expect(hash_body[:bookmarked]).to be true
+ end
+ end
+
+ describe 'POST #destroy' do
+ let(:status) { Fabricate(:status, account: user.account) }
+
+ before do
+ Bookmark.find_or_create_by!(account: user.account, status: status)
+ post :destroy, params: { status_id: status.id }
+ end
+
+ it 'returns http success' do
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'updates the bookmarked attribute' do
+ expect(user.account.bookmarked?(status)).to be false
+ end
+ end
+ end
+end
--- /dev/null
+Fabricator(:bookmark) do
+ account
+ status
+end
cat aescling's git repositories / mastodon.git / commitdiff