Skip to content

[IMPROVE] Adds toast after follow/unfollow messages and following icon for followed messages without threads. #20025

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 3 commits into from
Mar 23, 2021
Merged

[IMPROVE] Adds toast after follow/unfollow messages and following icon for followed messages without threads. #20025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be45495
Adds toast after follow/unfollow messages and following icon for foll…
RonLek Jan 2, 2021
00e80e5
Merge branch 'develop' into following_alert_and_icon
RonLek Jan 12, 2021
d9e734b
Merge branch 'develop' into following_alert_and_icon
RonLek Jan 26, 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
6 changes: 5 additions & 1 deletion app/threads/client/messageAction/follow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';

import { Messages } from '../../../models/client';
import { settings } from '../../../settings/client';
Expand All @@ -18,7 +20,9 @@ Meteor.startup(function() {
context: ['message', 'message-mobile', 'threads'],
async action() {
const { msg } = messageArgs(this);
call('followMessage', { mid: msg._id });
call('followMessage', { mid: msg._id }).then(() =>
toastr.success(TAPi18n.__('You_followed_this_message')),
);
},
condition({ msg: { _id, tmid, replies = [] }, u }, context) {
if (tmid || context) {
Expand Down
6 changes: 5 additions & 1 deletion app/threads/client/messageAction/unfollow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
import toastr from 'toastr';

import { Messages } from '../../../models/client';
import { settings } from '../../../settings/client';
Expand All @@ -18,7 +20,9 @@ Meteor.startup(function() {
context: ['message', 'message-mobile', 'threads'],
async action() {
const { msg } = messageArgs(this);
call('unfollowMessage', { mid: msg._id });
call('unfollowMessage', { mid: msg._id }).then(() =>
toastr.success(TAPi18n.__('You_unfollowed_this_message')),
);
},
condition({ msg: { _id, tmid, replies = [] }, u }, context) {
if (tmid || context) {
Expand Down
5 changes: 5 additions & 0 deletions app/ui-message/client/message.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@
{{#if showStar}}
<span title="{{_ "Message_has_been_starred"}}" class="starred"><i class="icon-star"></i></span>
{{/if}}
{{#if following }}
{{#unless msg.tcount}}
<span title="{{_ "Following"}}" class="following"><i class="icon-bell"></i></span>
{{/unless}}
{{/if}}
{{#if msg.alert}}
<div title="{{_ msg.alert }}" class="message-unread"></div>
{{/if}}
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4227,6 +4227,7 @@
"You_can_use_an_emoji_as_avatar": "You can also use an emoji as an avatar.",
"You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "You can use webhooks to easily integrate Omnichannel with your CRM.",
"You_cant_leave_a_livechat_room_Please_use_the_close_button": "You can't leave a omnichannel room. Please, use the close button.",
"You_followed_this_message": "You followed this message.",
"You_have_a_new_message": "You have a new message",
"You_have_been_muted": "You have been muted and cannot speak in this room",
"You_have_n_codes_remaining": "You have __number__ codes remaining.",
Expand All @@ -4244,6 +4245,7 @@
"You_reached_the_maximum_number_of_guest_users_allowed_by_your_license": "You reached the maximum number of guest users allowed by your license.",
"You_should_inform_one_url_at_least": "You should define at least one URL.",
"You_should_name_it_to_easily_manage_your_integrations": "You should name it to easily manage your integrations.",
"You_unfollowed_this_message": "You unfollowed this message.",
"You_will_be_asked_for_permissions": "You will be asked for permissions",
"You_will_not_be_able_to_recover": "You will not be able to recover this message!",
"You_will_not_be_able_to_recover_email_inbox": "You will not be able to recover this email inbox",
Expand Down