Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .docker-mongo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.16.1-buster-slim
FROM node:12.18.3-buster-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.16.1-buster-slim
FROM node:12.18.3-buster-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
echo "github.event_name: ${{ github.event_name }}"
cat $GITHUB_EVENT_PATH

- name: Use Node.js 12.16.1
- name: Use Node.js 12.18.3
uses: actions/setup-node@v1
with:
node-version: "12.16.1"
node-version: "12.18.3"

- uses: actions/checkout@v2

Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:

strategy:
matrix:
node-version: ["12.16.1"]
node-version: ["12.18.3"]
mongodb-version: ["3.4", "3.6", "4.0"]

steps:
Expand Down Expand Up @@ -290,10 +290,10 @@ jobs:
path: ~/.meteor
key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}

- name: Use Node.js 12.16.1
- name: Use Node.js 12.18.3
uses: actions/setup-node@v1
with:
node-version: "12.16.1"
node-version: "12.18.3"

- name: Install Meteor
run: |
Expand Down
8 changes: 4 additions & 4 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ accounts-facebook@1.3.2
accounts-github@1.4.3
accounts-google@1.3.3
accounts-meteor-developer@1.4.2
accounts-password@1.6.0
accounts-password@1.6.2
accounts-twitter@1.4.2
blaze-html-templates
check@1.3.1
ddp-rate-limiter@1.0.7
ddp-rate-limiter@1.0.9
ddp-common@1.4.0
dynamic-import@0.5.2
ecmascript@0.14.3
typescript@3.7.6
ejson@1.1.1
email@1.2.3
email@2.0.0
fastclick@1.0.13
http@1.4.2
jquery@1.11.10
Expand Down Expand Up @@ -70,7 +70,7 @@ littledata:synced-cron

edgee:slingshot
jalik:ufs-local@1.0.2
accounts-base@1.6.0
accounts-base@1.7.0
accounts-oauth@1.2.0
autoupdate@1.6.0
babel-compiler@7.5.3
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.10.2
METEOR@1.11
14 changes: 7 additions & 7 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
accounts-base@1.6.0
accounts-base@1.7.0
accounts-facebook@1.3.2
accounts-github@1.4.3
accounts-google@1.3.3
accounts-meteor-developer@1.4.2
accounts-oauth@1.2.0
accounts-password@1.6.1
accounts-password@1.6.2
accounts-twitter@1.4.2
aldeed:simple-schema@1.5.4
allow-deny@1.1.0
Expand All @@ -27,7 +27,7 @@ dandv:caret-position@2.1.1
ddp@1.4.0
ddp-client@2.3.3
ddp-common@1.4.0
ddp-rate-limiter@1.0.8
ddp-rate-limiter@1.0.9
ddp-server@2.3.2
deepwell:bootstrap-datepicker2@1.3.0
deps@1.0.12
Expand All @@ -36,11 +36,11 @@ dispatch:run-as-user@1.1.1
dynamic-import@0.5.2
ecmascript@0.14.3
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.10.0
ecmascript-runtime-server@0.9.0
ecmascript-runtime-client@0.11.0
ecmascript-runtime-server@0.10.0
edgee:slingshot@0.7.1
ejson@1.1.1
email@1.2.3
email@2.0.0
es5-shim@4.8.0
facebook-oauth@1.7.0
facts-base@1.0.1
Expand Down Expand Up @@ -97,7 +97,7 @@ mystor:device-detection@0.2.0
nimble:restivus@0.8.12
nooitaf:colors@1.1.2_1
npm-bcrypt@0.9.3
npm-mongo@3.7.1
npm-mongo@3.8.0
oauth@1.3.0
oauth1@1.3.0
oauth2@1.3.0
Expand Down
2 changes: 1 addition & 1 deletion .snapcraft/resources/preparenode
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

node_version="v12.16.1"
node_version="v12.18.3"

unamem="$(uname -m)"
if [[ $unamem == *aarch64* ]]; then
Expand Down
10 changes: 8 additions & 2 deletions app/livechat/server/lib/Helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,16 @@ export const createLivechatSubscription = (rid, name, guest, agent) => {
return Subscriptions.insert(subscriptionData);
};

export const createLivechatQueueView = () => {
export const createLivechatQueueView = async () => {
const { mongo } = MongoInternals.defaultRemoteCollectionDriver();

mongo.db.createCollection('view_livechat_queue_status', { // name of the view to create
// recreate the view on every startup
const list = await mongo.db.listCollections({ name: 'view_livechat_queue_status' }).toArray();
if (list.length > 0) {
await mongo.db.dropCollection('view_livechat_queue_status');
}

await mongo.db.createCollection('view_livechat_queue_status', { // name of the view to create
viewOn: 'rocketchat_room', // name of source collection from which to create the view
pipeline: [
{
Expand Down
41 changes: 23 additions & 18 deletions package-lock.json

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