feature/rejoin-as-admin (#225)

* fixes * proto * updated * fixes
SoapboxSocial · Feb 25, 2021 · 413710b · 413710b
1 parent 191ccdc
commit 413710b
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 84 deletions.
diff --git a/pkg/rooms/pb/signal.pb.go b/pkg/rooms/pb/signal.pb.go
diff --git a/pkg/rooms/room.go b/pkg/rooms/room.go
@@ -47,6 +47,9 @@ type Room struct {
 	kicked       map[int]bool
 	invited      map[int]bool
 
+	// users that were admins when they disconnected.
+	adminsOnDisconnected map[int]bool
+
 	link string
 
 	peerToMember map[string]int
@@ -60,17 +63,18 @@ type Room struct {
 
 func NewRoom(id, name string, group *groups.Group, owner int, visibility pb.Visibility, session *sfu.Session) *Room {
 	r := &Room{
-		id:           id,
-		name:         name,
-		visibility:   visibility,
-		group:        group,
-		state:        closed,
-		members:      make(map[int]*Member),
-		adminInvites: make(map[int]bool),
-		kicked:       make(map[int]bool),
-		invited:      make(map[int]bool),
-		peerToMember: make(map[string]int),
-		session:      session,
+		id:                   id,
+		name:                 name,
+		visibility:           visibility,
+		group:                group,
+		state:                closed,
+		members:              make(map[int]*Member),
+		adminInvites:         make(map[int]bool),
+		kicked:               make(map[int]bool),
+		invited:              make(map[int]bool),
+		peerToMember:         make(map[string]int),
+		adminsOnDisconnected: make(map[int]bool),
+		session:              session,
 	}
 
 	r.invited[owner] = true
@@ -122,6 +126,13 @@ func (r *Room) Name() string {
 	return r.name
 }
 
+func (r *Room) WasAdminOnDisconnect(id int) bool {
+	r.mux.RLock()
+	defer r.mux.RUnlock()
+
+	return r.adminsOnDisconnected[id]
+}
+
 func (r *Room) ConnectionState() RoomConnectionState {
 	r.mux.RLock()
 	defer r.mux.RUnlock()
@@ -242,6 +253,10 @@ func (r *Room) Handle(me *Member) {
 		return
 	}
 
+	r.mux.Lock()
+	delete(r.adminsOnDisconnected, me.id)
+	r.mux.Unlock()
+
 	me.StartChannel(CHANNEL)
 
 	r.mux.Lock()
@@ -293,6 +308,10 @@ func (r *Room) onDisconnected(id int64) {
 	}
 
 	r.mux.Lock()
+	if peer.Role() == pb.RoomState_RoomMember_ADMIN {
+		r.adminsOnDisconnected[int(id)] = true
+	}
+
 	delete(r.members, int(id))
 	r.mux.Unlock()
 

diff --git a/pkg/rooms/server.go b/pkg/rooms/server.go
@@ -141,6 +141,10 @@ func (s *Server) Signal(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		if r.WasAdminOnDisconnect(user.ID) {
+			me.SetRole(pb.RoomState_RoomMember_ADMIN)
+		}
+
 		err = conn.Write(&pb.SignalReply{
 			Id: in.Id,
 			Payload: &pb.SignalReply_Join{
@@ -150,6 +154,7 @@ func (s *Server) Signal(w http.ResponseWriter, r *http.Request) {
 						Type: answer.Type.String(),
 						Sdp:  answer.SDP,
 					},
+					Role: me.Role(),
 				},
 			},
 		})