Room actions (#231)

* Layout


* Empty starred list


* Favorite room

* Pinned messages

* fix last messages

* fix date on pinned messages

.circleci/config.yml

@@ -41,8 +41,8 @@ jobs:
       - image: circleci/android:api-26-alpha
 
     environment:
-      GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"
-      JVM_OPTS: -Xmx2048m
+      GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"
+      JVM_OPTS: -Xmx4096m
       TERM: dumb
       BASH_ENV: "~/.nvm/nvm.sh"
 

app/actions/actionsTypes.js

@@ -89,6 +89,8 @@ export const SERVER = createRequestTypes('SERVER', [
 export const METEOR = createRequestTypes('METEOR_CONNECT', [...defaultTypes, 'DISCONNECT', 'DISCONNECT_BY_USER']);
 export const LOGOUT = 'LOGOUT'; // logout is always success
 export const ACTIVE_USERS = createRequestTypes('ACTIVE_USERS', ['SET', 'REQUEST']);
+export const STARRED_MESSAGES = createRequestTypes('STARRED_MESSAGES', ['OPEN', 'CLOSE', 'MESSAGE_RECEIVED', 'MESSAGE_UNSTARRED']);
+export const PINNED_MESSAGES = createRequestTypes('PINNED_MESSAGES', ['OPEN', 'CLOSE', 'MESSAGE_RECEIVED', 'MESSAGE_UNPINNED']);
 
 export const INCREMENT = 'INCREMENT';
 export const DECREMENT = 'DECREMENT';

app/actions/pinnedMessages.js

@@ -0,0 +1,28 @@
+import * as types from './actionsTypes';
+
+export function openPinnedMessages(rid) {
+	return {
+		type: types.PINNED_MESSAGES.OPEN,
+		rid
+	};
+}
+
+export function closePinnedMessages() {
+	return {
+		type: types.PINNED_MESSAGES.CLOSE
+	};
+}
+
+export function pinnedMessageReceived(message) {
+	return {
+		type: types.PINNED_MESSAGES.MESSAGE_RECEIVED,
+		message
+	};
+}
+
+export function pinnedMessageUnpinned(messageId) {
+	return {
+		type: types.PINNED_MESSAGES.MESSAGE_UNPINNED,
+		messageId
+	};
+}

app/actions/starredMessages.js

@@ -0,0 +1,28 @@
+import * as types from './actionsTypes';
+
+export function openStarredMessages(rid) {
+	return {
+		type: types.STARRED_MESSAGES.OPEN,
+		rid
+	};
+}
+
+export function closeStarredMessages() {
+	return {
+		type: types.STARRED_MESSAGES.CLOSE
+	};
+}
+
+export function starredMessageReceived(message) {
+	return {
+		type: types.STARRED_MESSAGES.MESSAGE_RECEIVED,
+		message
+	};
+}
+
+export function starredMessageUnstarred(messageId) {
+	return {
+		type: types.STARRED_MESSAGES.MESSAGE_UNSTARRED,
+		messageId
+	};
+}

app/containers/message/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { View, TouchableHighlight, Text, TouchableOpacity, Vibration } from 'react-native';
+import { View, TouchableHighlight, Text, TouchableOpacity, Vibration, ViewPropTypes } from 'react-native';
 import { connect } from 'react-redux';
 import Icon from 'react-native-vector-icons/MaterialIcons';
 import moment from 'moment';
@@ -33,17 +33,18 @@ import styles from './styles';
 export default class Message extends React.Component {
 	static propTypes = {
 		item: PropTypes.object.isRequired,
-		reactions: PropTypes.object.isRequired,
+		reactions: PropTypes.any.isRequired,
 		baseUrl: PropTypes.string.isRequired,
 		Message_TimeFormat: PropTypes.string.isRequired,
 		message: PropTypes.object.isRequired,
 		user: PropTypes.object.isRequired,
 		editing: PropTypes.bool,
-		actionsShow: PropTypes.func,
 		errorActionsShow: PropTypes.func,
 		customEmojis: PropTypes.object,
 		toggleReactionPicker: PropTypes.func,
-		onReactionPress: PropTypes.func
+		onReactionPress: PropTypes.func,
+		style: ViewPropTypes.style,
+		onLongPress: PropTypes.func
 	}
 
 	constructor(props) {
@@ -73,7 +74,7 @@ export default class Message extends React.Component {
 	}
 
 	onLongPress() {
-		this.props.actionsShow(this.parseMessage());
+		this.props.onLongPress(this.parseMessage());
 	}
 
 	onErrorPress() {
@@ -222,7 +223,7 @@ export default class Message extends React.Component {
 
 	render() {
 		const {
-			item, message, editing, baseUrl, customEmojis
+			item, message, editing, baseUrl, customEmojis, style
 		} = this.props;
 		const username = item.alias || item.u.username;
 		const isEditing = message._id === item._id && editing;
@@ -235,7 +236,7 @@ export default class Message extends React.Component {
 				disabled={this.isDeleted() || this.hasError()}
 				underlayColor='#FFFFFF'
 				activeOpacity={0.3}
-				style={[styles.message, isEditing ? styles.editing : null]}
+				style={[styles.message, isEditing ? styles.editing : null, style]}
 				accessibilityLabel={accessibilityLabel}
 			>
 				<View style={styles.flex}>

app/containers/routes/AuthRoutes.js

@@ -4,9 +4,12 @@ import { StackNavigator, DrawerNavigator } from 'react-navigation';
 import Sidebar from '../../containers/Sidebar';
 import RoomsListView from '../../views/RoomsListView';
 import RoomView from '../../views/RoomView';
+import RoomActionsView from '../../views/RoomActionsView';
 import CreateChannelView from '../../views/CreateChannelView';
 import SelectUsersView from '../../views/SelectUsersView';
 import NewServerView from '../../views/NewServerView';
+import StarredMessagesView from '../../views/StarredMessagesView';
+import PinnedMessagesView from '../../views/PinnedMessagesView';
 
 const AuthRoutes = StackNavigator(
 	{
@@ -33,6 +36,27 @@ const AuthRoutes = StackNavigator(
 			navigationOptions: {
 				title: 'New server'
 			}
+		},
+		RoomActions: {
+			screen: RoomActionsView,
+			navigationOptions: {
+				title: 'Actions',
+				headerTintColor: '#292E35'
+			}
+		},
+		StarredMessages: {
+			screen: StarredMessagesView,
+			navigationOptions: {
+				title: 'Starred Messages',
+				headerTintColor: '#292E35'
+			}
+		},
+		PinnedMessages: {
+			screen: PinnedMessagesView,
+			navigationOptions: {
+				title: 'Pinned Messages',
+				headerTintColor: '#292E35'
+			}
 		}
 	},
 	{

app/lib/createStore.js

@@ -1,4 +1,4 @@
-import { createStore, applyMiddleware } from 'redux';
+import { createStore, applyMiddleware, compose } from 'redux';
 import createSagaMiddleware from 'redux-saga';
 import logger from 'redux-logger';
 import { composeWithDevTools } from 'remote-redux-devtools';
@@ -13,14 +13,15 @@ if (__DEV__) {
 	/* eslint-disable global-require */
 	const reduxImmutableStateInvariant = require('redux-immutable-state-invariant').default();
 
-	enhacers = composeWithDevTools(
+	const devComposer = composeWithDevTools({ hostname: 'localhost', port: 8000 });
+	enhacers = devComposer(
 		applyAppStateListener(),
 		applyMiddleware(reduxImmutableStateInvariant),
 		applyMiddleware(sagaMiddleware),
 		applyMiddleware(logger)
 	);
 } else {
-	enhacers = composeWithDevTools(
+	enhacers = compose(
 		applyAppStateListener(),
 		applyMiddleware(sagaMiddleware)
 	);

app/lib/realm.js

@@ -82,6 +82,7 @@ const subscriptionSchema = {
 		// groupMentions: 0,
 		roomUpdatedAt: { type: 'date', optional: true },
 		ro: { type: 'bool', optional: true },
+		lastOpen: { type: 'date', optional: true },
 		lastMessage: { type: 'messages', optional: true }
 	}
 };

app/lib/rocketchat.js

@@ -13,6 +13,8 @@ import { someoneTyping, roomMessageReceived } from '../actions/room';
 import { setUser } from '../actions/login';
 import { disconnect, disconnect_by_user, connectSuccess, connectFailure } from '../actions/connect';
 import { requestActiveUser } from '../actions/activeUsers';
+import { starredMessageReceived, starredMessageUnstarred } from '../actions/starredMessages';
+import { pinnedMessageReceived, pinnedMessageUnpinned } from '../actions/pinnedMessages';
 import Ddp from './ddp';
 
 export { Accounts } from 'react-native-meteor';
@@ -145,6 +147,30 @@ const RocketChat = {
 					});
 				}
 			});
+
+			this.ddp.on('rocketchat_starred_message', (ddpMessage) => {
+				if (ddpMessage.msg === 'added') {
+					const message = ddpMessage.fields;
+					message._id = ddpMessage.id;
+					const starredMessage = this._buildMessage(message);
+					return reduxStore.dispatch(starredMessageReceived(starredMessage));
+				}
+				if (ddpMessage.msg === 'removed') {
+					return reduxStore.dispatch(starredMessageUnstarred(ddpMessage.id));
+				}
+			});
+
+			this.ddp.on('rocketchat_pinned_message', (ddpMessage) => {
+				if (ddpMessage.msg === 'added') {
+					const message = ddpMessage.fields;
+					message._id = ddpMessage.id;
+					const pinnedMessage = this._buildMessage(message);
+					return reduxStore.dispatch(pinnedMessageReceived(pinnedMessage));
+				}
+				if (ddpMessage.msg === 'removed') {
+					return reduxStore.dispatch(pinnedMessageUnpinned(ddpMessage.id));
+				}
+			});
 		}).catch(console.log);
 	},
 
@@ -272,9 +298,7 @@ const RocketChat = {
 	_buildMessage(message) {
 		message.status = messagesStatus.SENT;
 		normalizeMessage(message);
-		if (message.urls) {
-			message.urls = RocketChat._parseUrls(message.urls);
-		}
+		message.urls = message.urls ? RocketChat._parseUrls(message.urls) : [];
 		// loadHistory returns message.starred as object
 		// stream-room-messages returns message.starred as an array
 		message.starred = message.starred && (Array.isArray(message.starred) ? message.starred.length > 0 : !!message.starred);
@@ -358,8 +382,15 @@ const RocketChat = {
 	createDirectMessage(username) {
 		return call('createDirectMessage', username);
 	},
-	readMessages(rid) {
-		return call('readMessages', rid);
+	async readMessages(rid) {
+		const ret = await call('readMessages', rid);
+
+		const [subscription] = database.objects('subscriptions').filtered('rid = $0', rid);
+		database.write(() => {
+			subscription.lastOpen = new Date();
+		});
+
+		return ret;
 	},
 	joinRoom(rid) {
 		return call('joinRoom', rid);
@@ -610,6 +641,9 @@ const RocketChat = {
 	},
 	setReaction(emoji, messageId) {
 		return call('setReaction', emoji, messageId);
+	},
+	toggleFavorite(rid, f) {
+		return call('toggleFavorite', rid, !f);
 	}
 };
 

app/reducers/index.js

@@ -12,6 +12,8 @@ import app from './app';
 import permissions from './permissions';
 import customEmojis from './customEmojis';
 import activeUsers from './activeUsers';
+import starredMessages from './starredMessages';
+import pinnedMessages from './pinnedMessages';
 
 export default combineReducers({
 	settings,
@@ -26,5 +28,7 @@ export default combineReducers({
 	rooms,
 	permissions,
 	customEmojis,
-	activeUsers
+	activeUsers,
+	starredMessages,
+	pinnedMessages
 });

app/reducers/pinnedMessages.js

@@ -0,0 +1,24 @@
+import { PINNED_MESSAGES } from '../actions/actionsTypes';
+
+const initialState = {
+	messages: []
+};
+
+export default function server(state = initialState, action) {
+	switch (action.type) {
+		case PINNED_MESSAGES.MESSAGE_RECEIVED:
+			return {
+				...state,
+				messages: [...state.messages, action.message]
+			};
+		case PINNED_MESSAGES.MESSAGE_UNPINNED:
+			return {
+				...state,
+				messages: state.messages.filter(message => message._id !== action.messageId)
+			};
+		case PINNED_MESSAGES.CLOSE:
+			return initialState;
+		default:
+			return state;
+	}
+}

app/reducers/starredMessages.js

@@ -0,0 +1,24 @@
+import { STARRED_MESSAGES } from '../actions/actionsTypes';
+
+const initialState = {
+	messages: []
+};
+
+export default function server(state = initialState, action) {
+	switch (action.type) {
+		case STARRED_MESSAGES.MESSAGE_RECEIVED:
+			return {
+				...state,
+				messages: [...state.messages, action.message]
+			};
+		case STARRED_MESSAGES.MESSAGE_UNSTARRED:
+			return {
+				...state,
+				messages: state.messages.filter(message => message._id !== action.messageId)
+			};
+		case STARRED_MESSAGES.CLOSE:
+			return initialState;
+		default:
+			return state;
+	}
+}

app/sagas/index.js

@@ -9,6 +9,8 @@ import createChannel from './createChannel';
 import init from './init';
 import state from './state';
 import activeUsers from './activeUsers';
+import starredMessages from './starredMessages';
+import pinnedMessages from './pinnedMessages';
 
 const root = function* root() {
 	yield all([
@@ -21,7 +23,9 @@ const root = function* root() {
 		messages(),
 		selectServer(),
 		state(),
-		activeUsers()
+		activeUsers(),
+		starredMessages(),
+		pinnedMessages()
 	]);
 };
 

app/sagas/pinnedMessages.js

@@ -0,0 +1,14 @@
+import { take, takeLatest } from 'redux-saga/effects';
+import * as types from '../actions/actionsTypes';
+import RocketChat from '../lib/rocketchat';
+
+const watchPinnedMessagesRoom = function* watchPinnedMessagesRoom({ rid }) {
+	const sub = yield RocketChat.subscribe('pinnedMessages', rid, 50);
+	yield take(types.PINNED_MESSAGES.CLOSE);
+	sub.unsubscribe().catch(e => alert(e));
+};
+
+const root = function* root() {
+	yield takeLatest(types.PINNED_MESSAGES.OPEN, watchPinnedMessagesRoom);
+};
+export default root;