BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(streaming): bot's default avatar

Browse Source 
Set a default avatar to bot. Add the defaults methods to handle
the new feature.
This commit is contained in:
Max Franke 2021-06-08 14:31:58 -03:00 committed by Arthurk12
parent 22c2a371b0
commit 740ff53fb5
6 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
View File

@ -77,6 +77,7 @@ public class ParamsProcessorUtil {
private Integer defaultHttpSessionTimeout = 14400;
private Boolean useDefaultAvatar = false;
private String defaultAvatarURL;
private String defaultBotAvatarURL;
private Boolean useDefaultWebcamBackground = false;
private String defaultWebcamBackgroundURL;
private String defaultGuestPolicy;
@ -783,6 +784,7 @@ public class ParamsProcessorUtil {
}
String avatarURL = useDefaultAvatar ? defaultAvatarURL : "";
String botAvatarURL = defaultBotAvatarURL;
String webcamBackgroundURL = useDefaultWebcamBackground ? defaultWebcamBackgroundURL : "";
if(defaultAllowDuplicateExtUserid == false) {
@ -803,6 +805,7 @@ public class ParamsProcessorUtil {
.withTelVoice(telVoice).withWebVoice(webVoice)
.withDialNumber(dialNumber)
.withDefaultAvatarURL(avatarURL)
.withDefaultBotAvatarURL(botAvatarURL)
.withDefaultWebcamBackgroundURL(webcamBackgroundURL)
.withAutoStartRecording(autoStartRec)
.withAllowStartStopRecording(allowStartStoptRec)
@ -1393,6 +1396,10 @@ public class ParamsProcessorUtil {
this.defaultAvatarURL = url;
}
public void setDefaultBotAvatarURL(String url) {
this.defaultBotAvatarURL = url;
}
public void setUseDefaultWebcamBackground(Boolean value) {
this.useDefaultWebcamBackground = value;
}

14
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
View File

@ -77,6 +77,7 @@ public class Meeting {
private Integer maxPinnedCameras = 0;
private String dialNumber;
private String defaultAvatarURL;
private String defaultBotAvatarURL;
private String defaultWebcamBackgroundURL;
private Map<String, Object> plugins;
private ArrayList<PluginsManifest> pluginsManifests;
@ -153,7 +154,8 @@ public class Meeting {
logoutUrl = builder.logoutUrl;
logoutTimer = builder.logoutTimer;
defaultAvatarURL = builder.defaultAvatarURL;
defaultWebcamBackgroundURL = builder.defaultWebcamBackgroundURL;
defaultBotAvatarURL = builder.defaultBotAvatarURL;
defaultWebcamBackgroundURL = builder.defaultWebcamBackgroundURL;
record = builder.record;
autoStartRecording = builder.autoStartRecording;
allowStartStopRecording = builder.allowStartStopRecording;
@ -479,6 +481,10 @@ public class Meeting {
return defaultAvatarURL;
}
public String getDefaultBotAvatarURL() {
return defaultBotAvatarURL;
}
public String getDefaultWebcamBackgroundURL() {
return defaultWebcamBackgroundURL;
}
@ -960,6 +966,7 @@ public class Meeting {
private Map<String, String> metadata;
private String dialNumber;
private String defaultAvatarURL;
private String defaultBotAvatarURL;
private String defaultWebcamBackgroundURL;
private long createdTime;
private boolean isBreakout;
@ -1113,6 +1120,11 @@ public class Meeting {
return this;
}
public Builder withDefaultBotAvatarURL(String w) {
defaultBotAvatarURL = w;
return this;
}
public Builder withDefaultWebcamBackgroundURL(String w) {
defaultWebcamBackgroundURL = w;
return this;

BIN
bigbluebutton-html5/public/resources/images/bot-avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 977 B

1
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
View File

@ -332,6 +332,7 @@ defaultHttpSessionTimeout=14400
# The default avatar image to display.
useDefaultAvatar=false
defaultAvatarURL=${bigbluebutton.web.serverURL}/html5client/resources/images/avatar.png
defaultBotAvatarURL=${bigbluebutton.web.serverURL}/html5client/resources/images/bot-avatar.png
# The default webcam background image to display.
useDefaultWebcamBackground=false

1
bigbluebutton-web/grails-app/conf/spring/resources.xml
View File

@ -162,6 +162,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="defaultMaxPinnedCameras" value="${maxPinnedCameras}"/>
<property name="useDefaultAvatar" value="${useDefaultAvatar}"/>
<property name="defaultAvatarURL" value="${defaultAvatarURL}"/>
<property name="defaultBotAvatarURL" value="${defaultBotAvatarURL}"/>
<property name="useDefaultWebcamBackground" value="${useDefaultWebcamBackground}"/>
<property name="defaultWebcamBackgroundURL" value="${defaultWebcamBackgroundURL}"/>
<property name="defaultGuestPolicy" value="${defaultGuestPolicy}"/>

2
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View File

@ -458,6 +458,8 @@ class ApiController {
if (!StringUtils.isEmpty(params.avatarURL)) {
us.avatarURL = params.avatarURL;
} else if (us.bot) {
us.avatarURL = meeting.defaultBotAvatarURL
} else {
us.avatarURL = meeting.defaultAvatarURL
}