Merge remote-tracking branch 'origin/styling/add-groups-link' into groups-updates

* origin/styling/add-groups-link: (31 commits)
  Comment out the "groups" button until ready to reveal.
  Changed the method of adding main navigation icons. Created a png sprite sized @2x based on largest usage (for retina). This will fix some rendering issues caused by using svg images. It will allow adding depth and more color / shading if we choose later.
  intents fix
  federation fix
  two more federation fixes
  Removed unused imports
  Removed unused PublicTimeline component
  Updated CommunityTimeline to add option for "all federated" content
  Removed unused import in unauthorized_modal
  Updated registration legal links
  Updated compose_form to account for if compose modal open
  Added empty message to pinned statuses page
  Updated nextProps withReplies for account timeline
  Added empty message to account_gallery media page
  Updated timeline/notification dequeue to be in componentDidMount
  Added TimelineQueueButtonHeader to status_list
  Added queue functionality status_list_container for status timelines
  Updated all Redis.current.publish, PushUpdateWorker.perform_async to work again
  Added timeline dequeue functionality to onSubmitCompose action
  Added redux functionality for queueing/dequeueing timelines
  ...

app/javascript/gabsocial/reducers/notifications.js

@@ -6,6 +6,9 @@ import {
   NOTIFICATIONS_FILTER_SET,
   NOTIFICATIONS_CLEAR,
   NOTIFICATIONS_SCROLL_TOP,
+  NOTIFICATIONS_UPDATE_QUEUE,
+  NOTIFICATIONS_DEQUEUE,
+  MAX_QUEUED_NOTIFICATIONS,
 } from '../actions/notifications';
 import {
   ACCOUNT_BLOCK_SUCCESS,
@@ -21,6 +24,8 @@ const initialState = ImmutableMap({
   top: false,
   unread: 0,
   isLoading: false,
+  queuedNotifications: ImmutableList(), //max = MAX_QUEUED_NOTIFICATIONS
+  totalQueuedNotificationsCount: 0, //used for queuedItems overflow for MAX_QUEUED_NOTIFICATIONS+
 });
 
 const notificationToMap = notification => ImmutableMap({
@@ -93,6 +98,32 @@ const deleteByStatus = (state, statusId) => {
   return state.update('items', list => list.filterNot(item => item !== null && item.get('status') === statusId));
 };
 
+const updateNotificationsQueue = (state, notification, intlMessages, intlLocale) => {
+  const queuedNotifications = state.getIn(['queuedNotifications'], ImmutableList());
+  const listedNotifications = state.getIn(['items'], ImmutableList());
+  const totalQueuedNotificationsCount = state.getIn(['totalQueuedNotificationsCount'], 0);
+
+  let alreadyExists = queuedNotifications.find(existingQueuedNotification => existingQueuedNotification.id === notification.id);
+  if (!alreadyExists) alreadyExists = listedNotifications.find(existingListedNotification => existingListedNotification.get('id') === notification.id);
+
+  if (alreadyExists) {
+    return state;
+  }
+
+  let newQueuedNotifications = queuedNotifications;
+
+  return state.withMutations(mutable => {
+    if (totalQueuedNotificationsCount <= MAX_QUEUED_NOTIFICATIONS) {
+      mutable.set('queuedNotifications', newQueuedNotifications.push({
+        notification,
+        intlMessages,
+        intlLocale,
+      }));
+    }
+    mutable.set('totalQueuedNotificationsCount', totalQueuedNotificationsCount + 1);
+  });
+};
+
 export default function notifications(state = initialState, action) {
   switch(action.type) {
   case NOTIFICATIONS_EXPAND_REQUEST:
@@ -105,6 +136,13 @@ export default function notifications(state = initialState, action) {
     return updateTop(state, action.top);
   case NOTIFICATIONS_UPDATE:
     return normalizeNotification(state, action.notification);
+  case NOTIFICATIONS_UPDATE_QUEUE:
+    return updateNotificationsQueue(state, action.notification, action.intlMessages, action.intlLocale);
+  case NOTIFICATIONS_DEQUEUE:
+    return state.withMutations(mutable => {
+      mutable.set('queuedNotifications', ImmutableList())
+      mutable.set('totalQueuedNotificationsCount', 0)
+    });
   case NOTIFICATIONS_EXPAND_SUCCESS:
     return expandNormalizedNotifications(state, action.notifications, action.next);
   case ACCOUNT_BLOCK_SUCCESS:

app/javascript/gabsocial/reducers/settings.js

@@ -1,6 +1,5 @@
 import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
 import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
-import { COLUMN_PARAMS_CHANGE } from '../actions/columns';
 import { STORE_HYDRATE } from '../actions/store';
 import { EMOJI_USE } from '../actions/emojis';
 import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
@@ -88,17 +87,6 @@ const defaultColumns = fromJS([
 
 const hydrate = (state, settings) => state.mergeDeep(settings).update('columns', (val = defaultColumns) => val);
 
-const changeColumnParams = (state, uuid, path, value) => {
-  const columns = state.get('columns');
-  const index   = columns.findIndex(item => item.get('uuid') === uuid);
-
-  const newColumns = columns.update(index, column => column.updateIn(['params', ...path], () => value));
-
-  return state
-    .set('columns', newColumns)
-    .set('saved', false);
-};
-
 const updateFrequentEmojis = (state, emoji) => state.update('frequentlyUsedEmojis', ImmutableMap(), map => map.update(emoji.id, 0, count => count + 1)).set('saved', false);
 
 const filterDeadListColumns = (state, listId) => state.update('columns', columns => columns.filterNot(column => column.get('id') === 'LIST' && column.get('params').get('id') === listId));
@@ -112,8 +100,6 @@ export default function settings(state = initialState, action) {
     return state
       .setIn(action.path, action.value)
       .set('saved', false);
-  case COLUMN_PARAMS_CHANGE:
-    return changeColumnParams(state, action.uuid, action.path, action.value);
   case EMOJI_USE:
     return updateFrequentEmojis(state, action.emoji);
   case SETTING_SAVE:

app/javascript/gabsocial/reducers/timelines.js

@@ -7,6 +7,9 @@ import {
   TIMELINE_EXPAND_FAIL,
   TIMELINE_CONNECT,
   TIMELINE_DISCONNECT,
+  TIMELINE_UPDATE_QUEUE,
+  TIMELINE_DEQUEUE,
+  MAX_QUEUED_ITEMS,
 } from '../actions/timelines';
 import {
   ACCOUNT_BLOCK_SUCCESS,
@@ -25,6 +28,8 @@ const initialTimeline = ImmutableMap({
   isLoading: false,
   hasMore: true,
   items: ImmutableList(),
+  queuedItems: ImmutableList(), //max= MAX_QUEUED_ITEMS
+  totalQueuedItemsCount: 0, //used for queuedItems overflow for MAX_QUEUED_ITEMS+
 });
 
 const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => {
@@ -77,6 +82,28 @@ const updateTimeline = (state, timeline, status) => {
   }));
 };
 
+const updateTimelineQueue = (state, timeline, status) => {
+  const queuedStatuses = state.getIn([timeline, 'queuedItems'], ImmutableList());
+  const listedStatuses = state.getIn([timeline, 'items'], ImmutableList());
+  const totalQueuedItemsCount = state.getIn([timeline, 'totalQueuedItemsCount'], 0);
+
+  let alreadyExists = queuedStatuses.find(existingQueuedStatus => existingQueuedStatus.get('id') === status.get('id'));
+  if (!alreadyExists) alreadyExists = listedStatuses.find(existingListedStatusId => existingListedStatusId === status.get('id'));
+
+  if (alreadyExists) {
+    return state;
+  }
+
+  let newQueuedStatuses = queuedStatuses;
+
+  return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
+    if (totalQueuedItemsCount <= MAX_QUEUED_ITEMS) {
+      mMap.set('queuedItems', newQueuedStatuses.push(status));
+    }
+    mMap.set('totalQueuedItemsCount', totalQueuedItemsCount + 1);
+  }));
+};
+
 const deleteStatus = (state, id, accountId, references, exclude_account = null) => {
   state.keySeq().forEach(timeline => {
     if (exclude_account === null || (timeline !== `account:${exclude_account}` && !timeline.startsWith(`account:${exclude_account}:`)))
@@ -126,6 +153,13 @@ export default function timelines(state = initialState, action) {
     return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial, action.isLoadingRecent);
   case TIMELINE_UPDATE:
     return updateTimeline(state, action.timeline, fromJS(action.status));
+  case TIMELINE_UPDATE_QUEUE:
+    return updateTimelineQueue(state, action.timeline, fromJS(action.status));
+  case TIMELINE_DEQUEUE:
+    return state.update(action.timeline, initialTimeline, map => map.withMutations(mMap => {
+      mMap.set('queuedItems', ImmutableList())
+      mMap.set('totalQueuedItemsCount', 0)
+    }));
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
   case TIMELINE_CLEAR: