Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@
"express": "^4.17.1",
"inquirer": "^7.1.0",
"ioredis": "^4.16.0",
"lodash": "^4.17.15",
"request": "^2.88.2",
"socket.io": "^2.3.0",
"yargs": "^15.3.1"
},
"devDependencies": {
"@types/lodash": "^4.14.149",
"@types/node": "^13.9.1",
"typescript": "^3.8.3"
},
Expand Down
18 changes: 10 additions & 8 deletions src/api/http-api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Log } from './../log';
let url = require('url');
import * as _ from 'lodash';

export class HttpApi {
/**
Expand Down Expand Up @@ -129,8 +128,10 @@ export class HttpApi {
};

if (this.channel.isPresence(channelName)) {
this.channel.presence.getMembers(channelName).then(members => {
result['user_count'] = _.uniqBy(members, 'user_id').length;
this.channel.presence.getMembers(channelName).then((members: any[]) => {
result['user_count'] = members.reduce(
(map, member) => map.set(member.user_id, member), new Map()
).size;

res.json(result);
});
Expand Down Expand Up @@ -158,11 +159,12 @@ export class HttpApi {
}

this.channel.presence.getMembers(channelName).then(members => {
let users = [];

_.uniqBy(members, 'user_id').forEach((member: any) => {
users.push({ id: member.user_id, user_info: member.user_info });
});
let users = [
...members.reduce((map, member) => map.set(member.user_id, {
id: member.user_id,
user_info: member.user_info
}), new Map())
]

res.json({ users: users });
}, error => Log.error(error));
Expand Down
7 changes: 5 additions & 2 deletions src/channels/presence-channel.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Database } from './../database';
import { Log } from './../log';
var _ = require("lodash");

export class PresenceChannel {
/**
Expand Down Expand Up @@ -94,7 +93,11 @@ export class PresenceChannel {

this.db.set(channel + ":members", members);

members = _.uniqBy(members.reverse(), "user_id");
members = [
...members.reduce(
(map, member) => map.set(member.user_id, member), new Map()
).values()
]

this.onSubscribed(socket, channel, members);

Expand Down