Merge pull request #175 from blindsidenetworks/recording-choices

Added choices to start meeting options to set recording preferences

server/config.go

@@ -17,6 +17,8 @@ limitations under the License.
 package main
 
 import (
+	"encoding/json"
+	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/pkg/errors"
 	"strings"
 )
@@ -30,6 +32,13 @@ type Configuration struct {
 	AllowExternalUsers bool   `json:"ALLOW_EXTERNAL_USERS"`
 }
 
+func (c Configuration) AsMap() map[string]interface{} {
+	data, _ := json.Marshal(c)
+	var asMap *map[string]interface{}
+	_ = json.Unmarshal(data, &asMap)
+	return *asMap
+}
+
 func (p *Plugin) OnConfigurationChange() error {
 	var newConfig Configuration
 	// loads configuration from our config ui page
@@ -45,11 +54,23 @@ func (p *Plugin) OnConfigurationChange() error {
 		p.job.Close()
 	}
 
-	// stores the config in an Atomic.Value place
+	if p.configuration.Load() != nil {
+		p.broadcastConfigChange(newConfig)
+	}
+
+	// stores the config in an `Atomic.Value` place
 	p.configuration.Store(&newConfig)
 	return err
 }
 
+func (p *Plugin) broadcastConfigChange(config Configuration) {
+	payload := map[string]interface{}{
+		"config": config.AsMap(),
+	}
+
+	p.API.PublishWebSocketEvent("config_update", payload, &model.WebsocketBroadcast{})
+}
+
 func (p *Plugin) config() *Configuration {
 	// returns the config file we had stored in Atomic.Value
 	config := p.configuration.Load()

server/helpers.go

@@ -39,7 +39,7 @@ const (
 	prefixMeetingList = "m_list_"
 )
 
-func (p *Plugin) PopulateMeeting(m *dataStructs.MeetingRoom, details []string, description string, UserId string, channelId string) error {
+func (p *Plugin) PopulateMeeting(m *dataStructs.MeetingRoom, details []string, description string, UserId string, channelId string, allowRecording bool) error {
 	if len(details) == 2 {
 		m.Name_ = details[1]
 	} else {
@@ -61,8 +61,8 @@ func (p *Plugin) PopulateMeeting(m *dataStructs.MeetingRoom, details []string, d
 	m.MeetingID_ = GenerateRandomID()
 	m.AttendeePW_ = "ap"
 	m.ModeratorPW_ = "mp"
-	m.Record = strconv.FormatBool(p.config().AllowRecordings)
-	m.AllowStartStopRecording = p.config().AllowRecordings
+	m.Record = strconv.FormatBool(p.config().AllowRecordings && allowRecording)
+	m.AllowStartStopRecording = p.config().AllowRecordings && allowRecording
 	m.AutoStartRecording = false
 	m.Meta = description
 	var RedirectUrl *url.URL
@@ -138,13 +138,18 @@ func (p *Plugin) createStartMeetingPost(userId string, channelId string, m *data
 
 	attachments := []*model.SlackAttachment{
 		{
-			Text: titlePrefix + "Meeting created by @" + user.Username,
+			Text: titlePrefix + "Meeting created by @" + user.Username + "\n\n",
 			Fields: []*model.SlackAttachmentField{
 				{
 					Title: "Attendees",
 					Value: "*There are no attendees in this session*",
 					Short: false,
 				},
+				{
+					Title: "Recording",
+					Value: "",
+					Short: false,
+				},
 				{
 					Title: "",
 					Value: "",
@@ -180,6 +185,12 @@ func (p *Plugin) createStartMeetingPost(userId string, channelId string, m *data
 		},
 	}
 
+	if m.AllowStartStopRecording {
+		attachments[0].Fields[1].Value = "Allowed"
+	} else {
+		attachments[0].Fields[1].Value = "Disabled"
+	}
+
 	if p.config().AllowExternalUsers {
 		attachments[0].Fields = append(attachments[0].Fields,
 			&model.SlackAttachmentField{

server/plugin.go

@@ -92,6 +92,18 @@ func (p *Plugin) OnActivate() error {
 		Trigger:          "bbb",
 		AutoComplete:     true,
 		AutoCompleteDesc: "Create a BigBlueButton meeting",
+		AutocompleteData: &model.AutocompleteData{
+			Trigger: "bbb",
+			HelpText: "Start a new BigBlueButton recording",
+			RoleID: model.SYSTEM_USER_ROLE_ID,
+			SubCommands: []*model.AutocompleteData{
+				{
+					Trigger: "no_recording",
+					HelpText: "Start a new meeting with recording disabled",
+					RoleID: model.SYSTEM_USER_ROLE_ID,
+				},
+			},
+		},
 	})
 }
 
@@ -122,7 +134,8 @@ func (p *Plugin) schedule() error {
 func (p *Plugin) ExecuteCommand(c *plugin.Context, args *model.CommandArgs) (*model.CommandResponse, *model.AppError) {
 	meetingpointer := new(dataStructs.MeetingRoom)
 
-	if err := p.PopulateMeeting(meetingpointer, nil, "", args.UserId, args.ChannelId); err != nil {
+	allowRecording := !strings.Contains(args.Command, "no_recording")
+	if err := p.PopulateMeeting(meetingpointer, nil, "", args.UserId, args.ChannelId, allowRecording); err != nil {
 		return nil, model.NewAppError("ExecuteCommand", "Please provide a 'Site URL' in Settings > General > Configuration", nil, err.Error(), http.StatusInternalServerError)
 	}
 
@@ -168,6 +181,8 @@ func (p *Plugin) ServeHTTP(c *plugin.Context, w http.ResponseWriter, r *http.Req
 		p.handleImmediateEndMeetingCallback(w, r, path)
 	} else if path == "/ismeetingrunning" {
 		p.handleIsMeetingRunning(w, r)
+	} else if path == "/config" {
+		p.handleGetConfig(w, r)
 	} else if path == "/redirect" {
 		// html file to automatically close a window
 		// nolint:staticcheck

server/responsehandlers.go

@@ -32,10 +32,11 @@ import (
 )
 
 type RequestCreateMeetingJSON struct {
-	UserId    string `json:"user_id"`
-	ChannelId string `json:"channel_id"`
-	Topic     string `json:"title"`
-	Desc      string `json:"description"`
+	UserId         string `json:"user_id"`
+	ChannelId      string `json:"channel_id"`
+	Topic          string `json:"title"`
+	Desc           string `json:"description"`
+	AllowRecording bool   `json:"allow_recording"`
 }
 
 type ButtonRequestJSON struct {
@@ -186,9 +187,9 @@ func (p *Plugin) handleCreateMeeting(w http.ResponseWriter, r *http.Request) {
 	meetingpointer := new(dataStructs.MeetingRoom)
 	var err error
 	if request.Topic == "" {
-		err = p.PopulateMeeting(meetingpointer, nil, request.Desc, request.UserId, request.ChannelId)
+		err = p.PopulateMeeting(meetingpointer, nil, request.Desc, request.UserId, request.ChannelId, request.AllowRecording)
 	} else {
-		err = p.PopulateMeeting(meetingpointer, []string{"create", request.Topic}, request.Desc, request.UserId, request.ChannelId)
+		err = p.PopulateMeeting(meetingpointer, []string{"create", request.Topic}, request.Desc, request.UserId, request.ChannelId, request.AllowRecording)
 	}
 
 	if err != nil {
@@ -952,6 +953,24 @@ func (p *Plugin) handleDeleteRecordings(w http.ResponseWriter, r *http.Request)
 	w.WriteHeader(http.StatusOK)
 }
 
+func (p *Plugin) handleGetConfig(w http.ResponseWriter, r *http.Request) {
+	config := p.config()
+
+	sanitizedConfig := &Configuration{
+		AllowRecordings: config.AllowRecordings,
+	}
+
+	data, err := json.Marshal(sanitizedConfig)
+	if err != nil {
+		p.API.LogError("Error occurred marshaling sanitizing config.", "error", err.Error())
+		http.Error(w, "Error occurred marshaling sanitizing config", http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	_, _ = w.Write(data)
+}
+
 type isRunningResponseJSON struct {
 	IsRunning bool `json:"running"`
 }

webapp/action_types.js

@@ -2,6 +2,6 @@ import PluginId from './plugin_id';
 
 // Namespace your actions to avoid collisions.
 export const STATUS_CHANGE = PluginId + '_status_change';
-
 export const OPEN_ROOT_MODAL = PluginId + '_open_root_modal';
 export const CLOSE_ROOT_MODAL = PluginId + '_close_root_modal';
+export const SET_PLUGIN_CONFIG = PluginId + '_set_plugin_config';

webapp/actions/index.js

@@ -40,10 +40,10 @@ export const closeRootModal = () => (dispatch) => {
 export const mainMenuAction = openRootModal;
 export const channelHeaderButtonAction = openRootModal;
 
-export function startMeeting(channelId, description = '', topic = '', meetingId = 0) {
+export function startMeeting(channelId, allowRecording, description = '', topic = '', meetingId = 0) {
   return async (dispatch, getState) => {
     try {
-      await GetClient().startMeeting(getState().entities.users.currentUserId, channelId, topic, description);
+      await GetClient().startMeeting(getState().entities.users.currentUserId, channelId, topic, description, allowRecording);
     } catch (error) {
       var message_text = 'BigBlueButton did not successfully start a meeting';
       if (error.status == 422 ) { // SiteURL is not set

webapp/client/client.js

@@ -29,12 +29,13 @@ export default class Client {
     return `${this.siteUrlFunc()}/plugins/bigbluebutton`
   }
 
-  startMeeting = async (userid, channelid, topic, description) => {
+  startMeeting = async (userid, channelid, topic, description, allowRecording) => {
     return this.doPost(`${this.baseUrl}/create`, {
       user_id: userid,
       channel_id: channelid,
       title: topic,
-      description: description
+      description: description,
+      allow_recording: allowRecording,
     });
   }
 
@@ -77,6 +78,10 @@ export default class Client {
     });
   }
 
+  getPluginConfig = async () => {
+    return await this.doPost(`${this.baseUrl}/config`)
+  }
+
   doPost = async (url, body, headers = {}) => {
     const options = Client4.getOptions({
         method: 'post',

webapp/components/root/index.js

@@ -21,7 +21,7 @@ import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
 import {getLastPostPerChannel} from 'mattermost-redux/selectors/entities/posts';
 import {getChannelsInCurrentTeam, getDirectChannels, getSortedUnreadChannelIds, makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
-import {isRootModalVisible} from '../../selectors';
+import {getPluginState, isRootModalVisible} from '../../selectors';
 import {getSortedDirectChannelWithUnreadsIds} from 'mattermost-redux/selectors/entities/channels';
 import {getJoinURL,startMeeting, showRecordings,closeRootModal} from '../../actions';
 
@@ -45,6 +45,7 @@ function mapStateToProps(state, ownProps) {
     channelId = '';
   }
   let teamId = state.entities.teams.currentTeamId;
+  const pluginConfig = getPluginState(state).pluginConfig
 
   return {
     visible: isRootModalVisible(state),
@@ -59,6 +60,7 @@ function mapStateToProps(state, ownProps) {
     theme: getTheme(state),
     lastpostperchannel: getLastPostPerChannel(state),
     unreadChannelIds: getSortedDirectChannelWithUnreadsIds(state, keepChannelIdAsUnread),
+    pluginConfig,
     ...ownProps
   };
 }

webapp/components/root/popover_list_members_item.jsx

@@ -25,7 +25,7 @@ export default class PopoverListMembersItem extends React.PureComponent {
   static propTypes = {
     onItemClick: PropTypes.func.isRequired,
     text: PropTypes.element.isRequired,
-    cam: PropTypes.number.isRequired,
+    icon: PropTypes.string.isRequired,
     theme: PropTypes.object.isRequired,
     ariaLabel: PropTypes.string,
   };
@@ -52,19 +52,24 @@ export default class PopoverListMembersItem extends React.PureComponent {
   render() {
     const style = getStyle(this.props.theme);
 
+    console.log(this.props);
+    console.log(this.props.icon);
+    console.log(Svgs[this.props.icon]);
+
     return (
       <button
         aria-label={this.props.ariaLabel}
         className={'style--none'}
         onMouseEnter={this.rowStartShowHover}
         onMouseLeave={this.rowStartHideHover}
         onClick={this.handleClick}
-        style={this.state.rowStartHover ? style.popoverRowHover : style.popoverRowNoHover}
+        style={this.state.rowStartHover ? {...style.popoverRowBase, ...style.popoverRowHover} : style.popoverRowBase}
       >
         <span
           style={style.popoverIcon}
           className='pull-left'
-          dangerouslySetInnerHTML={this.props.cam == 1 ? {__html: Svgs.BBBCAM} : {__html: Svgs.VID_CAM_PLAY}}
+          // dangerouslySetInnerHTML={this.props.cam == 1 ? {__html: Svgs.BBBCAM} : {__html: Svgs.VID_CAM_PLAY}}
+          dangerouslySetInnerHTML={{__html: Svgs[this.props.icon]}}
           aria-hidden='true'
         />
         <div style={style.popoverRow}>
@@ -80,18 +85,16 @@ const getStyle = makeStyleFromTheme((theme) => {
   return {
 
     popoverRow: {
-      border: 'none',
-      cursor: 'pointer',
-      height: '50px',
-      margin: '1px 0',
-      overflow: 'auto',
-      padding: '6px 19px 0 10px',
+      padding: '0 12px',
     },
-    popoverRowNoHover: {
+    popoverRowBase: {
       borderLeft: '3px solid',
       borderColor: theme.centerChannelBg,
       fontWeight: 'normal',
       width: '100%',
+      display: 'flex',
+      height: '60px',
+      padding: '6px 12px',
     },
     popoverRowHover: {
       borderLeft: '3px solid transparent',
@@ -101,19 +104,12 @@ const getStyle = makeStyleFromTheme((theme) => {
     },
     popoverText: {
       fontWeight: 'inherit',
-      fontSize: '14px',
-      position: 'relative',
-      top: '10px',
-      left: '4px',
+      fontSize: '13px',
       textAlign: 'left',
     },
     popoverIcon: {
-      margin: '0',
-      paddingLeft: '16px',
-      position: 'relative',
-      top: '12px',
-      fontSize: '20px',
-      fill: theme.buttonBg,
+      height: '90%',
+      padding: '4px',
     },
   };
 });