Merge branch 'lib-jitsi-meet' of github.com:jitsi/jitsi-meet into lib-jitsi-meet

JitsiConference.js

@@ -260,6 +260,16 @@ JitsiConference.prototype.setDisplayName = function(name) {
     }
 };
 
+/**
+ * Set new subject for this conference. (available only for moderator)
+ * @param {string} subject new subject
+ */
+JitsiConference.prototype.setSubject = function (subject) {
+    if (this.room && this.isModerator()) {
+        this.room.setSubject(subject);
+    }
+};
+
 /**
  * Adds JitsiLocalTrack object to the conference.
  * @param track the JitsiLocalTrack object.
@@ -787,6 +797,10 @@ function setupListeners(conference) {
         }
     );
 
+    conference.room.addListener(XMPPEvents.SUBJECT_CHANGED, function (subject) {
+        conference.eventEmitter.emit(JitsiConferenceEvents.SUBJECT_CHANGED, subject);
+    });
+
     conference.room.addListener(XMPPEvents.MUC_JOINED, function () {
         conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_JOINED);
     });

JitsiConferenceEvents.js

@@ -39,6 +39,10 @@ var JitsiConferenceEvents = {
      * A user has changed it display name
      */
     DISPLAY_NAME_CHANGED: "conference.displayNameChanged",
+    /**
+     * Indicates that subject of the conference has changed.
+     */
+    SUBJECT_CHANGED: "conference.subjectChanged",
     /**
      * A participant avatar has changed.
      */

doc/API.md

@@ -83,6 +83,7 @@ JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.ERROR);
         - USER_LEFT - a participant left conference. (parameters - id(string), user(JitsiParticipant))
         - MESSAGE_RECEIVED - new text message received. (parameters - id(string), text(string), ts(number))
         - DISPLAY_NAME_CHANGED - user has changed his display name. (parameters - id(string), displayName(string))
+        - SUBJECT_CHANGED - notifies that subject of the conference has changed (parameters - subject(string))
         - LAST_N_ENDPOINTS_CHANGED - last n set was changed (parameters - array of ids of users)
         - IN_LAST_N_CHANGED - passes boolean property that shows whether the local user is included in last n set of any other user or not. (parameters - boolean)
         - CONFERENCE_JOINED - notifies the local user that he joined the conference successfully. (no parameters)
@@ -287,6 +288,11 @@ The object represents a conference. We have the following methods to control the
     - overallFeedback an integer between 1 and 5 indicating the user feedback
     - detailedFeedback detailed feedback from the user. Not yet used
 
+30. setSubject(subject) - change subject of the conference
+    - subject - string new subject
+
+    Note: available only for moderator
+
 JitsiTrack
 ======
 The object represents single track - video or audio. They can be remote tracks ( from the other participants in the call) or local tracks (from the devices of the local participant).

lib-jitsi-meet.js

@@ -262,6 +262,16 @@ JitsiConference.prototype.setDisplayName = function(name) {
     }
 };
 
+/**
+ * Set new subject for this conference. (available only for moderator)
+ * @param {string} subject new subject
+ */
+JitsiConference.prototype.setSubject = function (subject) {
+    if (this.room && this.isModerator()) {
+        this.room.setSubject(subject);
+    }
+};
+
 /**
  * Adds JitsiLocalTrack object to the conference.
  * @param track the JitsiLocalTrack object.
@@ -789,6 +799,10 @@ function setupListeners(conference) {
         }
     );
 
+    conference.room.addListener(XMPPEvents.SUBJECT_CHANGED, function (subject) {
+        conference.eventEmitter.emit(JitsiConferenceEvents.SUBJECT_CHANGED, subject);
+    });
+
     conference.room.addListener(XMPPEvents.MUC_JOINED, function () {
         conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_JOINED);
     });
@@ -1177,6 +1191,10 @@ var JitsiConferenceEvents = {
      * A user has changed it display name
      */
     DISPLAY_NAME_CHANGED: "conference.displayNameChanged",
+    /**
+     * Indicates that subject of the conference has changed.
+     */
+    SUBJECT_CHANGED: "conference.subjectChanged",
     /**
      * A participant avatar has changed.
      */
@@ -7778,7 +7796,6 @@ ChatRoom.prototype.setSubject = function (subject) {
     var msg = $msg({to: this.roomjid, type: 'groupchat'});
     msg.c('subject', subject);
     this.connection.send(msg);
-    logger.log("topic changed to " + subject);
 };
 
 

modules/xmpp/ChatRoom.js

@@ -366,7 +366,6 @@ ChatRoom.prototype.setSubject = function (subject) {
     var msg = $msg({to: this.roomjid, type: 'groupchat'});
     msg.c('subject', subject);
     this.connection.send(msg);
-    logger.log("topic changed to " + subject);
 };