Button that allows moderators to lower someone else's hand

Author: DiegoMzmn

backend/src/main/java/urjc/ovteaching/OpenViduComponent.java

@@ -33,11 +33,15 @@
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.TrustStrategy;
 import org.apache.http.util.EntityUtils;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
 import io.openvidu.java.client.OpenVidu;
@@ -215,20 +219,21 @@ public String stopRecording(Room room) {
 		return null;
 	}
 
-	public void sendSignalToEveryone(Room room, String type, String data) throws UnsupportedEncodingException, IOException {
+	public void sendSignal(Room room, JsonArray to, String type, JsonObject data) throws UnsupportedEncodingException, IOException {
 		Session session = this.roomIdSession.get(room.getId());
 
 		HttpPost request = new HttpPost(this.OPENVIDU_URL + "/api/signal");
 
 		JsonObject json = new JsonObject();
 		json.addProperty("session", session.getSessionId());
+		json.add("to", to);
 		json.addProperty("type", "signal:" + type);
-		json.addProperty("data", data);
+		json.addProperty("data", data.toString());
 
 		StringEntity params = new StringEntity(json.toString());
 		request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
 		request.setEntity(params);
-
+		
 		HttpResponse response = this.httpClient.execute(request);
 		try {
 			int statusCode = response.getStatusLine().getStatusCode();

backend/src/main/java/urjc/ovteaching/rooms/controllers/OpenViduController.java

@@ -1,10 +1,13 @@
 package urjc.ovteaching.rooms.controllers;
 
 import java.io.IOException;
+import java.util.HashSet;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,6 +20,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+
 import io.openvidu.java.client.OpenViduHttpException;
 import io.openvidu.java.client.OpenViduJavaClientException;
 import urjc.ovteaching.OpenViduComponent;
@@ -237,7 +243,7 @@ public ResponseEntity<String> stopRecording(@PathVariable String roomName, HttpS
 	 * @return HttpStatus of the operation
 	 */
 	@PostMapping("/room/{roomName}/signal/{type}")
-	public ResponseEntity<?> sendSignal(@PathVariable String roomName, @PathVariable String type, @RequestBody JSONObject data, HttpServletRequest request) {
+	public ResponseEntity<?> sendSignal(@PathVariable String roomName, @PathVariable String type, @RequestBody JSONObject body, HttpServletRequest request) {
 		if (!request.isUserInRole("USER")) { // User not logged
 			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		}
@@ -257,7 +263,8 @@ public ResponseEntity<?> sendSignal(@PathVariable String roomName, @PathVariable
 		}
 
 		try {
-			this.openViduComponent.sendSignalToEveryone(room, type, data.toString());
+			JsonObject gsonBody = new Gson().fromJson(body.toString(), JsonObject.class);
+			this.openViduComponent.sendSignal(room, gsonBody.getAsJsonArray("to"), type, gsonBody.getAsJsonObject("data"));
 		} catch (IOException e) {
 			System.err.println(e.toString());
 			return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);

backend/src/main/java/urjc/ovteaching/rooms/controllers/RoomController.java

@@ -248,7 +248,7 @@ public ResponseEntity<Integer> raiseHand(@PathVariable String roomName, @Request
 	 * @return the httpStatus of the operation
 	 */
 	@DeleteMapping("/room/{roomName}/raiseHand")
-	public ResponseEntity<?> lowerHand(@PathVariable String roomName, @RequestBody JSONObject connectionId, HttpServletRequest request) {
+	public ResponseEntity<?> lowerHand(@PathVariable String roomName, @RequestBody JSONObject body, HttpServletRequest request) {
 		if (!request.isUserInRole("USER")) {
 			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
 		}
@@ -259,7 +259,7 @@ public ResponseEntity<?> lowerHand(@PathVariable String roomName, @RequestBody J
 			return new ResponseEntity<>(HttpStatus.NOT_FOUND);
 		}
 		if (room.isInRoom(user)) {
-			boolean wasRemoved = room.removeHandRaisedUser(connectionId);
+			boolean wasRemoved = room.removeHandRaisedUser(body);
 			this.roomServ.save(room);
 			if(wasRemoved) {
 				return new ResponseEntity<>(HttpStatus.OK);

frontend/src/app/shared/components/popup/popup.component.html

@@ -8,4 +8,5 @@
     <mat-card-content *ngIf="this.content">
        {{this.content}}
     </mat-card-content>
+    <button mat-flat-button *ngIf="isRaiseHand && userSrv.isModOfRoom(roomName)" (click)="sendSignalLowerHand()" color="primary">Lower their hand</button>
 </mat-card>

frontend/src/app/shared/components/popup/popup.component.ts

@@ -1,3 +1,5 @@
+import { OpenViduService } from './../../services/open-vidu.service';
+import { UserService } from './../../services/user.service';
 import { Component, OnInit, Input } from '@angular/core';
 
 @Component({
@@ -12,11 +14,17 @@ export class PopupComponent implements OnInit {
   @Input() userAvatar: string;
   @Input() content: string;
   @Input() color: string;
+  @Input() isRaiseHand: boolean;
+  @Input() roomName: string;
+  @Input() connectionId: string;
 
   backgroundColor: string;
   letterColor: string;
 
-  constructor() { }
+  constructor(
+    private userSrv: UserService,
+    private openviduSrv: OpenViduService
+  ) { }
 
   ngOnInit() {
     if(this.color==='dark') {
@@ -30,4 +38,11 @@ export class PopupComponent implements OnInit {
       this.letterColor = 'rgb(0, 0, 0)';
     }
   }
+
+  sendSignalLowerHand() {
+    this.openviduSrv.sendSignal(this.roomName, 'lowerYourHand', [this.connectionId],{}).subscribe(
+      (_) => {},
+      error => console.error(error) 
+    );
+  }
 }

frontend/src/app/shared/services/open-vidu.service.ts

@@ -88,6 +88,17 @@ export class OpenViduService {
     });
   }
 
+  sendSignal(roomName: string, type: string, to: string[], data: any) {
+    const body = {
+      to: to,
+      data: data
+    }
+    return this.http.post(this.baseURL + '/room/' + roomName + '/signal/' + type, body)
+      .pipe(
+        catchError(error => this.handleError(error))
+      );
+  }
+
   private handleError(error: any) {
     console.error(error);
     return Observable.throw("Server error (" + error.status + "): " + error.message)

frontend/src/app/video-room/video-room.component.html

@@ -116,7 +116,10 @@
           [userName]="notification.nickname"
           [userAvatar]="notification.userAvatar"
           [content]="notification.content"
-          [color]="notification.color">
+          [color]="notification.color"
+          [isRaiseHand]="false"
+          [roomName]="this.mySessionId"
+          [connectionId]="undefined">
         </popup-component>
 
         <popup-component
@@ -129,7 +132,10 @@
           [userName]="handsRaised[0].nickname"
           [userAvatar]="handsRaised[0].avatar"
           [content]="handsRaisedMessage"
-          [color]="'accent'">
+          [color]="'accent'"
+          [isRaiseHand]="true"
+          [roomName]="this.mySessionId"
+          [connectionId]="handsRaised[0].connectionId">
         </popup-component>
 
         <div id="layout" class="bounds" [class.boundsLight]="lightTheme">

frontend/src/app/video-room/video-room.component.ts

@@ -777,7 +777,12 @@ export class VideoRoomComponent implements OnInit, OnDestroy {
     this.session.on('signal:lowerYourHand', (event:any) => {
       if(event.from===undefined) { 
         //Only do something if "from" is undefined, which means the signal was called by the backend
-        this.raiseHand();
+        this.roomService.lowerHand(this.mySessionId, this.localUsers[0].getConnectionId()).subscribe(
+          (_) => {
+            this.raiseHand();
+          },
+          error => console.error(error) 
+        );
       }
     });
   }