[FIX] Avatar of message as an emoji

app/containers/Avatar.js

@@ -5,9 +5,10 @@ import FastImage from 'react-native-fast-image';
 import { settings as RocketChatSettings } from '@rocket.chat/sdk';
 import Touch from '../utils/touch';
 import { avatarURL } from '../utils/avatar';
+import Markdown from './markdown';
 
 const Avatar = React.memo(({
-	text, size, baseUrl, borderRadius, style, avatar, type, children, userId, token, onPress, theme
+	text, size, baseUrl, borderRadius, style, avatar, type, children, userId, token, onPress, theme, emoji, getCustomEmoji
 }) => {
 	const avatarStyle = {
 		width: size,
@@ -23,7 +24,14 @@ const Avatar = React.memo(({
 		type, text, size, userId, token, avatar, baseUrl
 	});
 
-	let image = (
+	let image = emoji ? (
+		<Markdown
+			msg={emoji}
+			baseUrl={baseUrl}
+			getCustomEmoji={getCustomEmoji}
+			theme={theme}
+		/>
+	) : (
 		<FastImage
 			style={avatarStyle}
 			source={{
@@ -55,14 +63,16 @@ Avatar.propTypes = {
 	style: PropTypes.any,
 	text: PropTypes.string,
 	avatar: PropTypes.string,
+	emoji: PropTypes.string,
 	size: PropTypes.number,
 	borderRadius: PropTypes.number,
 	type: PropTypes.string,
 	children: PropTypes.object,
 	userId: PropTypes.string,
 	token: PropTypes.string,
 	theme: PropTypes.string,
-	onPress: PropTypes.func
+	onPress: PropTypes.func,
+	getCustomEmoji: PropTypes.func
 };
 
 Avatar.defaultProps = {

app/containers/message/MessageAvatar.js

@@ -6,7 +6,7 @@ import Avatar from '../Avatar';
 import styles from './styles';
 
 const MessageAvatar = React.memo(({
-	isHeader, avatar, author, baseUrl, user, small, navToRoomInfo
+	isHeader, avatar, author, baseUrl, user, small, navToRoomInfo, getCustomEmoji, theme, emoji
 }) => {
 	if (isHeader && author) {
 		const navParam = {
@@ -24,9 +24,12 @@ const MessageAvatar = React.memo(({
 					size={small ? 20 : 36}
 					borderRadius={small ? 2 : 4}
 					avatar={avatar}
+					emoji={emoji}
+					theme={theme}
 					baseUrl={baseUrl}
 					userId={user.id}
 					token={user.token}
+					getCustomEmoji={getCustomEmoji}
 				/>
 			</TouchableOpacity>
 		);
@@ -37,11 +40,14 @@ const MessageAvatar = React.memo(({
 MessageAvatar.propTypes = {
 	isHeader: PropTypes.bool,
 	avatar: PropTypes.string,
+	emoji: PropTypes.string,
+	theme: PropTypes.string,
 	author: PropTypes.obj,
 	baseUrl: PropTypes.string,
 	user: PropTypes.obj,
 	small: PropTypes.bool,
-	navToRoomInfo: PropTypes.func
+	navToRoomInfo: PropTypes.func,
+	getCustomEmoji: PropTypes.func
 };
 MessageAvatar.displayName = 'MessageAvatar';
 

app/containers/message/index.js

@@ -229,7 +229,7 @@ class MessageContainer extends React.Component {
 			item, user, style, archived, baseUrl, useRealName, broadcast, fetchThreadName, customThreadTimeFormat, showAttachment, timeFormat, isReadReceiptEnabled, autoTranslateRoom, autoTranslateLanguage, navToRoomInfo, getCustomEmoji, isThreadRoom, callJitsi, blockAction, rid, theme
 		} = this.props;
 		const {
-			id, msg, ts, attachments, urls, reactions, t, avatar, u, alias, editedBy, role, drid, dcount, dlm, tmid, tcount, tlm, tmsg, mentions, channels, unread, blocks, autoTranslate: autoTranslateMessage
+			id, msg, ts, attachments, urls, reactions, t, avatar, emoji, u, alias, editedBy, role, drid, dcount, dlm, tmid, tcount, tlm, tmsg, mentions, channels, unread, blocks, autoTranslate: autoTranslateMessage
 		} = item;
 
 		let message = msg;
@@ -253,6 +253,7 @@ class MessageContainer extends React.Component {
 				reactions={reactions}
 				alias={alias}
 				avatar={avatar}
+				emoji={emoji}
 				user={user}
 				timeFormat={timeFormat}
 				customThreadTimeFormat={customThreadTimeFormat}

app/lib/database/model/Message.js

@@ -30,6 +30,8 @@ export default class Message extends Model {
 
 	@field('avatar') avatar;
 
+	@field('emoji') emoji;
+
 	@json('attachments', sanitizer) attachments;
 
 	@json('urls', sanitizer) urls;

app/lib/database/model/Thread.js

@@ -30,6 +30,8 @@ export default class Thread extends Model {
 
 	@field('avatar') avatar;
 
+	@field('emoji') emoji;
+
 	@json('attachments', sanitizer) attachments;
 
 	@json('urls', sanitizer) urls;

app/lib/database/model/ThreadMessage.js

@@ -32,6 +32,8 @@ export default class ThreadMessage extends Model {
 
 	@field('avatar') avatar;
 
+	@field('emoji') emoji;
+
 	@json('attachments', sanitizer) attachments;
 
 	@json('urls', sanitizer) urls;

app/lib/database/model/migrations.js

@@ -74,6 +74,29 @@ export default schemaMigrations({
 					]
 				})
 			]
+		},
+		{
+			toVersion: 8,
+			steps: [
+				addColumns({
+					table: 'messages',
+					columns: [
+						{ name: 'emoji', type: 'string', isOptional: true }
+					]
+				}),
+				addColumns({
+					table: 'thread_messages',
+					columns: [
+						{ name: 'emoji', type: 'string', isOptional: true }
+					]
+				}),
+				addColumns({
+					table: 'threads',
+					columns: [
+						{ name: 'emoji', type: 'string', isOptional: true }
+					]
+				})
+			]
 		}
 	]
 });

app/lib/database/schema/app.js

@@ -1,7 +1,7 @@
 import { appSchema, tableSchema } from '@nozbe/watermelondb';
 
 export default appSchema({
-	version: 7,
+	version: 8,
 	tables: [
 		tableSchema({
 			name: 'subscriptions',
@@ -66,6 +66,7 @@ export default appSchema({
 				{ name: 'parse_urls', type: 'string' },
 				{ name: 'groupable', type: 'boolean', isOptional: true },
 				{ name: 'avatar', type: 'string', isOptional: true },
+				{ name: 'emoji', type: 'string', isOptional: true },
 				{ name: 'attachments', type: 'string', isOptional: true },
 				{ name: 'urls', type: 'string', isOptional: true },
 				{ name: '_updated_at', type: 'number' },
@@ -104,6 +105,7 @@ export default appSchema({
 				{ name: 'parse_urls', type: 'string', isOptional: true },
 				{ name: 'groupable', type: 'boolean', isOptional: true },
 				{ name: 'avatar', type: 'string', isOptional: true },
+				{ name: 'emoji', type: 'string', isOptional: true },
 				{ name: 'attachments', type: 'string', isOptional: true },
 				{ name: 'urls', type: 'string', isOptional: true },
 				{ name: 'status', type: 'number', isOptional: true },
@@ -140,6 +142,7 @@ export default appSchema({
 				{ name: 'parse_urls', type: 'string', isOptional: true },
 				{ name: 'groupable', type: 'boolean', isOptional: true },
 				{ name: 'avatar', type: 'string', isOptional: true },
+				{ name: 'emoji', type: 'string', isOptional: true },
 				{ name: 'attachments', type: 'string', isOptional: true },
 				{ name: 'urls', type: 'string', isOptional: true },
 				{ name: 'status', type: 'number', isOptional: true },