Skip to content

Commit

Permalink
Merge pull request #25 from bigbluebutton/develop
Browse files Browse the repository at this point in the history
chore: update from develop (1.4.1)
  • Loading branch information
prlanzarin authored Feb 28, 2023
2 parents 61f89b6 + 524c578 commit 570921c
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 18 deletions.
7 changes: 7 additions & 0 deletions lib/etherpad/methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const Logger = require('../utils/logger');
const logger = new Logger('methods');

const AUTHOR_ID = 'authorID';
const AUTHOR_MAPPER = 'authorMapper';
const GROUP_ID = 'groupID';
const PAD_ID = 'padID';
const SESSION_ID = 'sessionID';
Expand Down Expand Up @@ -62,6 +63,12 @@ const methods = {
optional: [AUTHOR_NAME],
},
},
createAuthorIfNotExistsFor: {
params: {
mandatory: [AUTHOR_MAPPER],
optional: [AUTHOR_NAME],
},
},
listPadsOfAuthor: {
params: {
mandatory: [AUTHOR_ID],
Expand Down
2 changes: 1 addition & 1 deletion lib/redis/database.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ const createUser = (meetingId, {
return reject();
}

api.call('createAuthor', { name }).then(response => {
api.call('createAuthorIfNotExistsFor', { authorMapper: userId, name }).then(response => {
const authorId = response.authorID;
database[meetingId].users[userId] = {
authorId,
Expand Down
30 changes: 15 additions & 15 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bbb-pads",
"version": "1.4.0",
"version": "1.4.1",
"description": "BigBlueButton's pads manager",
"engines": {
"node": ">=16"
Expand Down Expand Up @@ -30,7 +30,7 @@
"express": "^4.17.3",
"http-proxy": "^1.18.1",
"lodash": "^4.17.21",
"prom-client": "^14.0.1",
"prom-client": "^14.1.1",
"redis": "^3.1.2"
},
"devDependencies": {
Expand Down

0 comments on commit 570921c

Please sign in to comment.