Merge pull request #2018 from The-Commit-Company/develop

Merging develop into main

Author: nikkothari22

frontend/src/hooks/useActiveSocketConnection.ts

@@ -19,9 +19,14 @@ export const useActiveSocketConnection = () => {
             console.log("Socket connection failed", socketConnectionCount.current)
             // If the socket connection fails more than 2 times, then show an error message
             if (socketConnectionCount.current === 2) {
-                toast.error("Realtime events are not working. Please try refreshing the page.", {
-                    duration: 5000
-                })
+                const isToastActive = toast.getToasts().some(toast => toast.id === "socket-connection-error")
+                if (!isToastActive) {
+                    toast.error("Realtime events are not working. Please try refreshing the page.", {
+                        duration: 5000,
+                        closeButton: true,
+                        id: "socket-connection-error"
+                    })
+                }
             } else {
                 // Else try to connect to socket
                 socket?.connect()

raven/permissions.py

@@ -22,14 +22,14 @@ def check_app_permission():
 def raven_user_has_permission(doc, user=None, ptype=None):
 
 	if doc.type == "Bot":
-		# Anyone with Raven User role can change the bot details
-		if user != "Guest":
-			if ptype == "read":
-				return True
-			else:
-				roles = frappe.get_roles()
-				if "Raven Admin" in roles:
-					return True
+		# Anyone with Raven User role can view the bot details
+		if ptype == "read":
+			return True
+
+		# Raven Admins can change the bot details
+		roles = frappe.get_roles(user=user)
+		if "Raven Admin" in roles:
+			return True
 	else:
 		# Only the user can change their own details
 		if doc.user == user:
@@ -158,7 +158,7 @@ def channel_has_permission(doc, user=None, ptype=None):
 				if channel_member.get("is_admin"):
 					return True
 				# If the user is a Raven Admin, they can update or delete the channel
-				roles = frappe.get_roles()
+				roles = frappe.get_roles(user=user)
 				if "Raven Admin" in roles:
 					return True
 
@@ -257,7 +257,7 @@ def channel_member_has_permission(doc, user=None, ptype=None):
 			if channel_member.get("is_admin"):
 				return True
 			# If the user is a Raven Admin, they can update the channel member
-			roles = frappe.get_roles()
+			roles = frappe.get_roles(user=user)
 			if "Raven Admin" in roles:
 				return True