Skip to content
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

Jump to bottom

[IMPROVE] Add more fields to iframe integration event unread-changed-by-subscription #15786

Merged
merged 2 commits into from
Nov 21, 2019
Merged

[IMPROVE] Add more fields to iframe integration event unread-changed-by-subscription #15786

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
6177eff
Add more fields to iframe subscription
MarcosSpessatto Nov 13, 2019
58c83d7
fix lint
MarcosSpessatto Nov 13, 2019
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
7 changes: 5 additions & 2 deletions client/startup/unread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Tracker } from 'meteor/tracker';
import { Session } from 'meteor/session';

import { Favico } from '../../app/favico';
import { ChatSubscription } from '../../app/models';
import { ChatSubscription, ChatRoom } from '../../app/models/client';
import { menu, fireGlobalEvent } from '../../app/ui-utils';
import { getUserPreference } from '../../app/utils';
import { settings } from '../../app/settings';
Expand All @@ -20,6 +20,8 @@ const fetchSubscriptions = () => ChatSubscription.find({
name: 1,
ls: 1,
unreadAlert: 1,
fname: 1,
prid: 1,
},
}).fetch();

Expand All @@ -30,7 +32,8 @@ Meteor.startup(() => {
let unreadAlert = false;

const unreadCount = fetchSubscriptions().reduce((ret, subscription) => {
fireGlobalEvent('unread-changed-by-subscription', subscription);
const room = ChatRoom.findOne({ _id: subscription.rid }, { fields: { usersCount: 1 } });
ggazzo marked this conversation as resolved.
Show resolved Hide resolved
fireGlobalEvent('unread-changed-by-subscription', { ...subscription, usersCount: room && room.usersCount });

if (subscription.alert || subscription.unread > 0) {
// Increment the total unread count.
Expand Down
1 change: 1 addition & 0 deletions server/publications/room/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export const fields = {
lastMessage: 1,
retention: 1,
prid: 1,
usersCount: 1,

// @TODO create an API to register this fields based on room type
livechatData: 1,
Expand Down