[NEW] Broadcast channels

app/actions/actionsTypes.js

@@ -71,7 +71,8 @@ export const MESSAGES = createRequestTypes('MESSAGES', [
 	'TOGGLE_PIN_FAILURE',
 	'SET_INPUT',
 	'CLEAR_INPUT',
-	'TOGGLE_REACTION_PICKER'
+	'TOGGLE_REACTION_PICKER',
+	'REPLY_BROADCAST'
 ]);
 export const CREATE_CHANNEL = createRequestTypes('CREATE_CHANNEL', [...defaultTypes]);
 export const SELECTED_USERS = createRequestTypes('SELECTED_USERS', ['ADD_USER', 'REMOVE_USER', 'RESET', 'SET_LOADING']);

app/actions/messages.js

@@ -183,3 +183,10 @@ export function toggleReactionPicker(message) {
 		message
 	};
 }
+
+export function replyBroadcast(message) {
+	return {
+		type: types.MESSAGES.REPLY_BROADCAST,
+		message
+	};
+}

app/containers/RoomTypeIcon.js

@@ -11,6 +11,10 @@ const styles = StyleSheet.create({
 });
 
 const RoomTypeIcon = ({ type, size }) => {
+	if (!type) {
+		return null;
+	}
+
 	const icon = {
 		c: 'pound',
 		p: 'lock',
@@ -21,7 +25,7 @@ const RoomTypeIcon = ({ type, size }) => {
 };
 
 RoomTypeIcon.propTypes = {
-	type: PropTypes.string.isRequired,
+	type: PropTypes.string,
 	size: PropTypes.number
 };
 

app/containers/message/index.js

@@ -18,10 +18,28 @@ import Reply from './Reply';
 import ReactionsModal from './ReactionsModal';
 import Emoji from './Emoji';
 import styles from './styles';
-import { actionsShow, errorActionsShow, toggleReactionPicker } from '../../actions/messages';
+import { actionsShow, errorActionsShow, toggleReactionPicker, replyBroadcast } from '../../actions/messages';
 import messagesStatus from '../../constants/messagesStatus';
 import Touch from '../../utils/touch';
 
+const SYSTEM_MESSAGES = [
+	'r',
+	'au',
+	'ru',
+	'ul',
+	'uj',
+	'rm',
+	'user-muted',
+	'user-unmuted',
+	'message_pinned',
+	'subscription-role-added',
+	'subscription-role-removed',
+	'room_changed_description',
+	'room_changed_announcement',
+	'room_changed_topic',
+	'room_changed_privacy'
+];
+
 const getInfoMessage = ({
 	t, role, msg, u
 }) => {
@@ -68,7 +86,8 @@ const getInfoMessage = ({
 }), dispatch => ({
 	actionsShow: actionMessage => dispatch(actionsShow(actionMessage)),
 	errorActionsShow: actionMessage => dispatch(errorActionsShow(actionMessage)),
-	toggleReactionPicker: message => dispatch(toggleReactionPicker(message))
+	toggleReactionPicker: message => dispatch(toggleReactionPicker(message)),
+	replyBroadcast: message => dispatch(replyBroadcast(message))
 }))
 export default class Message extends React.Component {
 	static propTypes = {
@@ -83,17 +102,20 @@ export default class Message extends React.Component {
 		editing: PropTypes.bool,
 		errorActionsShow: PropTypes.func,
 		toggleReactionPicker: PropTypes.func,
+		replyBroadcast: PropTypes.func,
 		onReactionPress: PropTypes.func,
 		style: ViewPropTypes.style,
 		onLongPress: PropTypes.func,
 		_updatedAt: PropTypes.instanceOf(Date),
-		archived: PropTypes.bool
+		archived: PropTypes.bool,
+		broadcast: PropTypes.bool
 	}
 
 	static defaultProps = {
 		onLongPress: () => {},
 		_updatedAt: new Date(),
-		archived: false
+		archived: false,
+		broadcast: false
 	}
 
 	constructor(props) {
@@ -116,6 +138,9 @@ export default class Message extends React.Component {
 		if (!equal(this.props.reactions, nextProps.reactions)) {
 			return true;
 		}
+		if (this.props.broadcast !== nextProps.broadcast) {
+			return true;
+		}
 		return this.props._updatedAt.toGMTString() !== nextProps._updatedAt.toGMTString();
 	}
 
@@ -150,25 +175,11 @@ export default class Message extends React.Component {
 	parseMessage = () => JSON.parse(JSON.stringify(this.props.item));
 
 	isInfoMessage() {
-		return [
-			'r',
-			'au',
-			'ru',
-			'ul',
-			'uj',
-			'rm',
-			'user-muted',
-			'user-unmuted',
-			'message_pinned',
-			'subscription-role-added',
-			'subscription-role-removed',
-			'room_changed_description',
-			'room_changed_announcement',
-			'room_changed_topic',
-			'room_changed_privacy'
-		].includes(this.props.item.t);
+		return SYSTEM_MESSAGES.includes(this.props.item.t);
 	}
 
+	isOwn = () => this.props.item.u && this.props.item.u._id === this.props.user.id;
+
 	isDeleted() {
 		return this.props.item.t === 'rm';
 	}
@@ -187,7 +198,7 @@ export default class Message extends React.Component {
 		if (previousItem && (
 			(previousItem.ts.toDateString() === item.ts.toDateString()) &&
 			(previousItem.u.username === item.u.username) &&
-			!(previousItem.groupable === false || item.groupable === false) &&
+			!(previousItem.groupable === false || item.groupable === false || this.props.broadcast === true) &&
 			(previousItem.status === item.status) &&
 			(item.ts - previousItem.ts < this.props.Message_GroupingPeriod * 1000)
 		)) {
@@ -303,6 +314,20 @@ export default class Message extends React.Component {
 		);
 	}
 
+	renderBroadcastReply() {
+		if (!this.props.broadcast || this.isOwn()) {
+			return null;
+		}
+		return (
+			<TouchableOpacity
+				style={styles.broadcastButton}
+				onPress={() => this.props.replyBroadcast(this.parseMessage())}
+			>
+				<Text style={styles.broadcastButtonText}>Reply</Text>
+			</TouchableOpacity>
+		);
+	}
+
 	render() {
 		const {
 			item, message, editing, style, archived
@@ -329,6 +354,7 @@ export default class Message extends React.Component {
 							{this.renderAttachment()}
 							{this.renderUrl()}
 							{this.renderReactions()}
+							{this.renderBroadcastReply()}
 						</View>
 					</View>
 					{this.state.reactionsModal &&

app/containers/message/styles.js

@@ -84,5 +84,18 @@ export default StyleSheet.create({
 		padding: 10,
 		paddingRight: 12,
 		paddingLeft: 0
+	},
+	broadcastButton: {
+		borderColor: '#1d74f5',
+		borderWidth: 2,
+		borderRadius: 2,
+		paddingVertical: 10,
+		width: 100,
+		alignItems: 'center',
+		justifyContent: 'center',
+		marginTop: 6
+	},
+	broadcastButtonText: {
+		color: '#1d74f5'
 	}
 });

app/lib/methods/helpers/mergeSubscriptionsRooms.js

@@ -4,6 +4,9 @@ import normalizeMessage from './normalizeMessage';
 export const merge = (subscription, room) => {
 	subscription.muted = [];
 	if (room) {
+		if (room.rid) {
+			subscription.rid = room.rid;
+		}
 		subscription.roomUpdatedAt = room._updatedAt;
 		subscription.lastMessage = normalizeMessage(room.lastMessage);
 		subscription.ro = room.ro;
@@ -13,6 +16,7 @@ export const merge = (subscription, room) => {
 		subscription.reactWhenReadOnly = room.reactWhenReadOnly;
 		subscription.archived = room.archived;
 		subscription.joinCodeRequired = room.joinCodeRequired;
+		subscription.broadcast = room.broadcast;
 
 		if (room.muted && room.muted.length) {
 			subscription.muted = room.muted.filter(user => user).map(user => ({ value: user }));
@@ -28,7 +32,8 @@ export const merge = (subscription, room) => {
 		subscription.notifications = false;
 	}
 
-	subscription.blocked = !!subscription.blocker;
+	subscription.blocker = !!subscription.blocker;
+	subscription.blocked = !!subscription.blocked;
 	return subscription;
 };
 

app/lib/methods/subscriptions/rooms.js

@@ -51,16 +51,24 @@ export default async function subscribeRooms(id) {
 			const [type, data] = ddpMessage.fields.args;
 			const [, ev] = ddpMessage.fields.eventName.split('/');
 			if (/subscriptions/.test(ev)) {
-				const tpm = merge(data);
+				const rooms = database.objects('rooms').filtered('_id == $0', data.rid);
+				const tpm = merge(data, rooms[0]);
 				database.write(() => {
 					database.create('subscriptions', tpm, true);
+					database.delete(rooms);
 				});
 			}
-			if (/rooms/.test(ev) && type === 'updated') {
-				const [sub] = database.objects('subscriptions').filtered('rid == $0', data._id);
-				database.write(() => {
-					merge(sub, data);
-				});
+			if (/rooms/.test(ev)) {
+				if (type === 'updated') {
+					const [sub] = database.objects('subscriptions').filtered('rid == $0', data._id);
+					database.write(() => {
+						merge(sub, data);
+					});
+				} else if (type === 'inserted') {
+					database.write(() => {
+						database.create('rooms', data, true);
+					});
+				}
 			}
 			if (/message/.test(ev)) {
 				const [args] = ddpMessage.fields.args;

app/lib/realm.js

@@ -49,10 +49,7 @@ const roomsSchema = {
 	primaryKey: '_id',
 	properties: {
 		_id: 'string',
-		t: 'string',
-		lastMessage: 'messages',
-		description: { type: 'string', optional: true },
-		_updatedAt: { type: 'date', optional: true }
+		broadcast: { type: 'bool', optional: true }
 	}
 };
 
@@ -97,11 +94,13 @@ const subscriptionSchema = {
 		announcement: { type: 'string', optional: true },
 		topic: { type: 'string', optional: true },
 		blocked: { type: 'bool', optional: true },
+		blocker: { type: 'bool', optional: true },
 		reactWhenReadOnly: { type: 'bool', optional: true },
 		archived: { type: 'bool', optional: true },
 		joinCodeRequired: { type: 'bool', optional: true },
 		notifications: { type: 'bool', optional: true },
-		muted: { type: 'list', objectType: 'usersMuted' }
+		muted: { type: 'list', objectType: 'usersMuted' },
+		broadcast: { type: 'bool', optional: true }
 	}
 };
 

app/lib/rocketchat.js

@@ -49,8 +49,10 @@ const RocketChat = {
 	subscribeRooms,
 	subscribeRoom,
 	canOpenRoom,
-	createChannel({ name, users, type }) {
-		return call(type ? 'createChannel' : 'createPrivateGroup', name, users, type);
+	createChannel({
+		name, users, type, readOnly, broadcast
+	}) {
+		return call(type ? 'createPrivateGroup' : 'createChannel', name, users, readOnly, {}, { broadcast });
 	},
 	async createDirectMessageAndWait(username) {
 		const room = await RocketChat.createDirectMessage(username);

app/sagas/messages.js

@@ -1,4 +1,5 @@
-import { takeLatest, put, call } from 'redux-saga/effects';
+import { delay } from 'redux-saga';
+import { takeLatest, put, call, select } from 'redux-saga/effects';
 import { MESSAGES } from '../actions/actionsTypes';
 import {
 	messagesSuccess,
@@ -12,9 +13,13 @@ import {
 	permalinkSuccess,
 	permalinkFailure,
 	togglePinSuccess,
-	togglePinFailure
+	togglePinFailure,
+	setInput
 } from '../actions/messages';
 import RocketChat from '../lib/rocketchat';
+import database from '../lib/realm';
+import { goRoom } from '../containers/routes/NavigationService';
+import log from '../utils/log';
 
 const deleteMessage = message => RocketChat.deleteMessage(message);
 const editMessage = message => RocketChat.editMessage(message);
@@ -81,12 +86,32 @@ const handleTogglePinRequest = function* handleTogglePinRequest({ message }) {
 	}
 };
 
+const handleReplyBroadcast = function* handleReplyBroadcast({ message }) {
+	try {
+		const { username } = message.u;
+		const subscriptions = database.objects('subscriptions').filtered('name = $0', username);
+		if (subscriptions.length) {
+			goRoom({ rid: subscriptions[0].rid, name: subscriptions[0].name });
+		} else {
+			const room = yield RocketChat.createDirectMessage(username);
+			goRoom({ rid: room.rid, name: username });
+		}
+		yield delay(100);
+		const server = yield select(state => state.server.server);
+		const msg = `[ ](${ server }/direct/${ username }?msg=${ message._id })`;
+		yield put(setInput({ msg }));
+	} catch (e) {
+		log('handleReplyBroadcast', e);
+	}
+};
+
 const root = function* root() {
 	yield takeLatest(MESSAGES.REQUEST, get);
 	yield takeLatest(MESSAGES.DELETE_REQUEST, handleDeleteRequest);
 	yield takeLatest(MESSAGES.EDIT_REQUEST, handleEditRequest);
 	yield takeLatest(MESSAGES.TOGGLE_STAR_REQUEST, handleToggleStarRequest);
 	yield takeLatest(MESSAGES.PERMALINK_REQUEST, handlePermalinkRequest);
 	yield takeLatest(MESSAGES.TOGGLE_PIN_REQUEST, handleTogglePinRequest);
+	yield takeLatest(MESSAGES.REPLY_BROADCAST, handleReplyBroadcast);
 };
 export default root;