Skip to content

Rewrite Broadcast #20119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 2 commits into from
Jan 15, 2021
Merged

Rewrite Broadcast #20119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc9e8c5
Rewrite Broadcast
ggazzo Jan 8, 2021
ecab116
Merge branch 'develop' into rewrite/broadcast
gabriellsh Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions app/ui-message/client/message.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@
{{> ThreadMetric counter=msg.tcount following=following lm=msg.tlm rid=msg.rid mid=msg._id unread=unread mention=mention all=all openThread=actions.openThread }}
{{/if}}

{{#if broadcast}}
{{> BroadCastMetric mid=msg._id username=msg.u.username replyBroadcast=actions.replyBroadcast }}
{{/if}}

{{#with readReceipt}}
<div class="read-receipt {{readByEveryone}}">
{{> icon icon="check" }}
Expand Down Expand Up @@ -168,13 +172,6 @@
{{/each}}
</ul>
{{/unless}}
{{#if broadcast}}
{{#with msg}}
<button type="button" class="js-reply-broadcast rc-button rc-button--primary rc-button--small rc-button--outline" name="button">
{{> icon icon="reply"}} {{_'Reply'}}
</button>
{{/with}}
{{/if}}
{{#unless hideReactions}}
<ul class="reactions">
{{#each reaction in reactions}}
Expand Down
2 changes: 1 addition & 1 deletion app/ui-message/client/messageBox/messageBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
t,
roomTypes,
getUserPreference,
} from '../../../utils';
} from '../../../utils/client';
import './messageBoxActions';
import './messageBoxReplyPreview';
import './messageBoxTyping';
Expand Down
11 changes: 10 additions & 1 deletion app/ui-utils/client/lib/messageContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
import { Subscriptions, Rooms, Users } from '../../../models/client';
import { hasPermission } from '../../../authorization/client';
import { settings } from '../../../settings/client';
import { getUserPreference } from '../../../utils/client';
import { getUserPreference, roomTypes } from '../../../utils/client';
import { AutoTranslate } from '../../../autotranslate/client';


const fields = { name: 1, username: 1, 'settings.preferences.showMessageInMainThread': 1, 'settings.preferences.autoImageLoad': 1, 'settings.preferences.saveMobileBandwidth': 1, 'settings.preferences.collapseMediaByDefault': 1, 'settings.preferences.hideRoles': 1 };

export function messageContext({ rid } = Template.instance()) {
Expand All @@ -33,6 +34,11 @@ export function messageContext({ rid } = Template.instance()) {
FlowRouter.goToRoomById(drid);
};

const replyBroadcast = (e) => {
const { username, mid } = e.currentTarget.dataset;
roomTypes.openRouteLink('d', { name: username }, { ...FlowRouter.current().queryParams, reply: mid });
};

return {
u: user,
room: Rooms.findOne({ _id: rid }, {
Expand All @@ -59,6 +65,9 @@ export function messageContext({ rid } = Template.instance()) {
openDiscussion() {
return openDiscussion;
},
replyBroadcast() {
return replyBroadcast;
},
},
settings: {
translateLanguage: AutoTranslate.getLanguage(rid),
Expand Down
6 changes: 1 addition & 5 deletions app/ui/client/views/app/lib/getCommonRoomEvents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { isURL } from '../../../../../utils/lib/isURL';
import { openUserCard } from '../../../lib/UserCard';
import { messageArgs } from '../../../../../ui-utils/client/lib/messageArgs';
import { ChatMessage, Rooms } from '../../../../../models';
import { t, roomTypes } from '../../../../../utils/client';
import { t } from '../../../../../utils/client';
import { chatMessages } from '../room';
import { EmojiEvents } from '../../../../../reactions/client/init';

Expand Down Expand Up @@ -183,10 +183,6 @@ export const getCommonRoomEvents = () => ({
jump: tmid && tmid !== _id && _id && _id,
});
},
'click .js-reply-broadcast'() {
const msg = messageArgs(this);
roomTypes.openRouteLink('d', { name: msg.u.username }, { ...FlowRouter.current().queryParams, reply: msg._id });
},

'click .image-to-download'(event) {
const { msg } = messageArgs(this);
Expand Down
1 change: 1 addition & 0 deletions client/adapters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ const { createTemplateForComponent } = require('./reactAdapters');

createTemplateForComponent('ThreadMetric', () => import('./components/Message/Metrics/Thread'));
createTemplateForComponent('DiscussionMetric', () => import('./components/Message/Metrics/Discussion'));
createTemplateForComponent('BroadCastMetric', () => import('./components/Message/Metrics/Broadcast'));
20 changes: 20 additions & 0 deletions client/components/Message/Metrics/Broadcast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React, { FC } from 'react';

import { useTranslation } from '../../../contexts/TranslationContext';
import { Reply, Content } from '..';


type BroadcastOptions = {
username: string;
mid: string;
replyBroadcast: () => void;
};

const BroadcastMetric: FC<BroadcastOptions> = ({ username, mid, replyBroadcast }) => {
const t = useTranslation();
return <Content>
<Reply data-username={username} data-mid={mid} onClick={replyBroadcast}>{t('Reply')}</Reply>
</Content>;
};

export default BroadcastMetric;