Added bookmarks

• Added:
- bookmarks for GabPRO members only
- migration for creation of StatusBookmarks
- all necessary routes, controllers
- redux for adding, removing, fetching and displaying bookmarks
- bookmark icon
- doorkeeper scopes
- backend and frontend support

Bookmarks behave like likes/favorites, except they aren't shared with other users and do not have an associated counter.

dfea7368c9

app/javascript/gabsocial/components/icon.js

@@ -11,6 +11,7 @@ import BackIcon from '../assets/back_icon'
 import BlockIcon from '../assets/block_icon'
 import BlockquoteIcon from '../assets/blockquote_icon'
 import BoldIcon from '../assets/bold_icon'
+import BookmarkIcon from '../assets/bookmark_icon'
 import CalendarIcon from '../assets/calendar_icon'
 import ChatIcon from '../assets/chat_icon'
 import CheckIcon from '../assets/check_icon'
@@ -93,6 +94,7 @@ const ICONS = {
   'block': BlockIcon,
   'blockquote': BlockquoteIcon,
   'bold': BoldIcon,
+  'bookmark': BookmarkIcon,
   'calendar': CalendarIcon,
   'chat': ChatIcon,
   'check': CheckIcon,

app/javascript/gabsocial/components/popover/status_options_popover.js

@@ -7,6 +7,8 @@ import {
   unrepost,
   pin,
   unpin,
+  bookmark,
+  unbookmark,
 } from '../../actions/interactions';
 import {
   muteStatus,
@@ -24,7 +26,10 @@ import { initMuteModal } from '../../actions/mutes'
 import { initReport } from '../../actions/reports'
 import { openModal } from '../../actions/modal'
 import { closePopover } from '../../actions/popover'
-import { MODAL_EMBED } from '../../constants'
+import {
+  MODAL_EMBED,
+  MODAL_PRO_UPGRADE,
+} from '../../constants'
 import PopoverLayout from './popover_layout'
 import List from '../list'
 
@@ -49,6 +54,8 @@ const messages = defineMessages({
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
   pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
   unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
+  bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark status' },
+  unbookmark: { id: 'status.unbookmark', defaultMessage: 'Remove bookmark' },
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
   group_remove_account: { id: 'status.remove_account_from_group', defaultMessage: 'Remove account from group' },
@@ -68,6 +75,7 @@ const mapStateToProps = (state, { status }) => {
   return {
     groupId,
     groupRelationships,
+    isPro: state.getIn(['accounts', me, 'is_pro']),
   }
 }
 
@@ -93,6 +101,16 @@ const mapDispatchToProps = (dispatch) => ({
     }
   },
 
+  onBookmark(status) {
+    dispatch(closePopover())
+
+    if (status.get('bookmarked')) {
+      dispatch(unbookmark(status))
+    } else {
+      dispatch(bookmark(status))
+    }
+  },
+
   onQuote(status, router) {
     dispatch(closePopover())
 
@@ -186,6 +204,11 @@ const mapDispatchToProps = (dispatch) => ({
     }))
   },
 
+  onOpenProUpgradeModal() {
+    dispatch(closePopover())
+    dispatch(openModal(MODAL_PRO_UPGRADE))
+  },
+
   onClosePopover: () => dispatch(closePopover()),
 })
 
@@ -213,8 +236,10 @@ class StatusOptionsPopover extends ImmutablePureComponent {
     intl: PropTypes.object.isRequired,
     onFetchGroupRelationships: PropTypes.func.isRequired,
     onOpenEmbedModal: PropTypes.func.isRequired,
+    onOpenProUpgradeModal: PropTypes.func.isRequired,
     onClosePopover: PropTypes.func.isRequired,
     isXS: PropTypes.bool,
+    isPro: PropTypes.bool,
   }
 
   updateOnProps = [
@@ -261,6 +286,14 @@ class StatusOptionsPopover extends ImmutablePureComponent {
     this.props.onPin(this.props.status)
   }
 
+  handleBookmarkClick = () => {
+    if (this.props.isPro) {
+      this.props.onBookmark(this.props.status)
+    } else {
+      this.props.onOpenProUpgradeModal()
+    }
+  }
+
   handleDeleteClick = () => {
     this.props.onDelete(this.props.status)
   }
@@ -346,6 +379,13 @@ class StatusOptionsPopover extends ImmutablePureComponent {
         })
       }
 
+      menu.push({
+        icon: 'bookmark',
+        hideArrow: true,
+        title: intl.formatMessage(status.get('bookmarked') ? messages.unbookmark : messages.bookmark),
+        onClick: this.handleBookmarkClick,
+      })
+      
       if (status.getIn(['account', 'id']) === me) {
         if (publicStatus) {
           menu.push({
@@ -355,7 +395,7 @@ class StatusOptionsPopover extends ImmutablePureComponent {
             onClick: this.handlePinClick,
           })
         }
-        
+
         menu.push({
           icon: 'trash',
           hideArrow: true,