direct message and team user add fix

Author: Saksham-Sirohi

app/eventyay/api/views/event.py

@@ -62,21 +62,10 @@
 # from pretix.presale.views.organizer import filter_qs_by_attr  # commented out
 from eventyay.api.task import configure_video_settings_for_talks
 from eventyay.api.utils import get_protocol
+from eventyay.eventyay_common.video.permissions import VIDEO_TRAIT_ROLE_MAP
 
 logger = logging.getLogger(__name__)
 
-VIDEO_TRAIT_ROLE_MAP = {
-    'video_stage_manager': 'video_stage_manager',
-    'video_channel_manager': 'video_channel_manager',
-    'video_direct_messaging': 'video_direct_messaging',
-    'video_announcement_manager': 'video_announcement_manager',
-    'video_user_viewer': 'video_user_viewer',
-    'video_user_moderator': 'video_user_moderator',
-    'video_room_manager': 'video_room_manager',
-    'video_kiosk_manager': 'video_kiosk_manager',
-    'video_config_manager': 'video_config_manager',
-}
-
 with scopes_disabled():
 
     class EventFilter(FilterSet):

app/eventyay/base/models/event.py

@@ -65,6 +65,7 @@
     has_any_permission,
     is_event_visible,
 )
+from eventyay.eventyay_common.video.permissions import VIDEO_PERMISSION_BY_FIELD, VIDEO_TRAIT_ROLE_MAP
 from .auth import User
 from ..settings import settings_hierarkey
 from .mixins import OrderedModel, PretalxModel
@@ -158,19 +159,6 @@ def default_grants():
     }
 
 
-VIDEO_TRAIT_ROLE_MAP = {
-    "video_stage_manager": "video_stage_manager",
-    "video_channel_manager": "video_channel_manager",
-    "video_direct_messaging": "video_direct_messaging",
-    "video_announcement_manager": "video_announcement_manager",
-    "video_user_viewer": "video_user_viewer",
-    "video_user_moderator": "video_user_moderator",
-    "video_room_manager": "video_room_manager",
-    "video_kiosk_manager": "video_kiosk_manager",
-    "video_config_manager": "video_config_manager",
-}
-
-
 FEATURE_FLAGS = [
     "schedule-control",
     "iframe-player",
@@ -1547,9 +1535,18 @@ def get_all_permissions(self, user):
                 )
                 and (required_traits or allow_empty_traits)
             ):
-                result[self].update(event_roles.get(role, SYSTEM_ROLES.get(role, [])))
-
-        # Removed user.world_grants loop (attribute not present on unified User model)
+                role_perms = event_roles.get(role, SYSTEM_ROLES.get(role, []))
+                
+                direct_messaging_def = VIDEO_PERMISSION_BY_FIELD.get('can_video_direct_message')
+                if direct_messaging_def and role != 'video_direct_messaging':
+                    direct_messaging_trait = direct_messaging_def.trait_value(self.slug)
+                    has_direct_messaging_trait = direct_messaging_trait in user.traits
+                    
+                    if not has_direct_messaging_trait:
+                        direct_message_value = Permission.EVENT_CHAT_DIRECT.value
+                        role_perms = [p for p in role_perms if (p if isinstance(p, str) else p.value) != direct_message_value]
+                
+                result[self].update(role_perms)
 
         for room in self.rooms.all():
             room_trait_grants = room.trait_grants if room.trait_grants is not None else {}

app/eventyay/base/models/world.py

@@ -31,8 +31,8 @@
 
 def default_roles():
     attendee = [
-        Permission.WORLD_VIEW,
-        Permission.WORLD_EXHIBITION_CONTACT,
+        Permission.EVENT_VIEW,
+        Permission.EVENT_EXHIBITION_CONTACT,
     ]
     viewer = attendee + [Permission.ROOM_VIEW, Permission.ROOM_CHAT_READ]
     participant = viewer + [
@@ -48,7 +48,7 @@ def default_roles():
         Permission.ROOM_JANUSCALL_JOIN,
         Permission.ROOM_ZOOM_JOIN,
     ]
-    room_creator = [Permission.WORLD_ROOMS_CREATE_CHAT]
+    room_creator = [Permission.EVENT_ROOMS_CREATE_CHAT]
     room_owner = participant + [
         Permission.ROOM_INVITE,
         Permission.ROOM_DELETE,
@@ -66,27 +66,27 @@ def default_roles():
         Permission.ROOM_QUESTION_MODERATE,
         Permission.ROOM_POLL_EARLY_RESULTS,
         Permission.ROOM_POLL_MANAGE,
-        Permission.WORLD_ANNOUNCE,
+        Permission.EVENT_ANNOUNCE,
     ]
     admin = (
         moderator
         + room_creator
         + [
-            Permission.WORLD_UPDATE,
+            Permission.EVENT_UPDATE,
             Permission.ROOM_DELETE,
             Permission.ROOM_UPDATE,
-            Permission.WORLD_ROOMS_CREATE_BBB,
-            Permission.WORLD_ROOMS_CREATE_STAGE,
-            Permission.WORLD_ROOMS_CREATE_EXHIBITION,
-            Permission.WORLD_ROOMS_CREATE_POSTER,
-            Permission.WORLD_USERS_LIST,
-            Permission.WORLD_USERS_MANAGE,
-            Permission.WORLD_GRAPHS,
-            Permission.WORLD_CONNECTIONS_UNLIMITED,
+            Permission.EVENT_ROOMS_CREATE_BBB,
+            Permission.EVENT_ROOMS_CREATE_STAGE,
+            Permission.EVENT_ROOMS_CREATE_EXHIBITION,
+            Permission.EVENT_ROOMS_CREATE_POSTER,
+            Permission.EVENT_USERS_LIST,
+            Permission.EVENT_USERS_MANAGE,
+            Permission.EVENT_GRAPHS,
+            Permission.EVENT_CONNECTIONS_UNLIMITED,
         ]
     )
-    apiuser = admin + [Permission.WORLD_API, Permission.WORLD_SECRETS]
-    scheduleuser = [Permission.WORLD_API]
+    apiuser = admin + [Permission.EVENT_API, Permission.EVENT_SECRETS]
+    scheduleuser = [Permission.EVENT_API]
     video_stage_manager = [Permission.EVENT_ROOMS_CREATE_STAGE]
     video_channel_manager = [Permission.EVENT_ROOMS_CREATE_CHAT, Permission.EVENT_ROOMS_CREATE_BBB]
     video_direct_messaging = [Permission.EVENT_CHAT_DIRECT]

app/eventyay/eventyay_common/video/permissions.py

@@ -36,6 +36,11 @@ def trait_value(self, event_slug: str) -> str:
     definition.trait_name for definition in VIDEO_PERMISSION_DEFINITIONS
 ]
 
+VIDEO_TRAIT_ROLE_MAP: Dict[str, str] = {
+    definition.trait_name: definition.trait_name
+    for definition in VIDEO_PERMISSION_DEFINITIONS
+}
+
 
 def iter_video_permission_definitions() -> Iterable[VideoPermissionDefinition]:
     return VIDEO_PERMISSION_DEFINITIONS

app/eventyay/eventyay_common/views/organizer.py

@@ -375,9 +375,11 @@ def _handle_team_update(self):
     def _handle_team_members(self):
         team = self._get_team_from_post()
         self._forced_section = 'permissions'
+        invite_form_prefix = self._invite_form_prefix(team)
+        prefixed_user_field = f'{invite_form_prefix}-user'
         invite_form = InviteForm(
-            data=(self.request.POST if 'user' in self.request.POST else None),
-            prefix=self._invite_form_prefix(team),
+            data=(self.request.POST if prefixed_user_field in self.request.POST else None),
+            prefix=invite_form_prefix,
         )
 
         request = self.request
@@ -448,7 +450,7 @@ def _handle_team_members(self):
                     messages.success(request, _('The invite has been resent.'))
                 return redirect(self._teams_tab_url(team.pk, section='permissions'))
 
-            elif 'user' in post and invite_form.is_valid() and invite_form.has_changed():
+            elif f'{invite_form_prefix}-user' in post and invite_form.is_valid() and invite_form.has_changed():
                 try:
                     user = User.objects.get(email__iexact=invite_form.cleaned_data['user'])
                 except User.DoesNotExist:

app/eventyay/webapp/src/components/CreateDmPrompt.vue

@@ -24,6 +24,11 @@ export default {
 	},
 	methods: {
 		async create(users) {
+			// Check permission before creating direct message
+			if (!this.hasPermission('world:chat.direct')) {
+				this.$emit('close')
+				return
+			}
 			// TODO error handling, progress
 			await this.$store.dispatch('chat/openDirectMessage', {users: users})
 			this.$emit('close')

app/eventyay/webapp/src/components/CreateStagePrompt.vue

@@ -78,7 +78,6 @@ export default {
 				this.$router.push({name: 'room', params: {roomId: room}})
 				this.$emit('close')
 			} catch (error) {
-				console.log(error)
 				this.loading = false
 				this.error = error.message || error
 			}

app/eventyay/webapp/src/components/RoomsSidebar.vue

@@ -50,7 +50,7 @@ transition(name="sidebar")
 				bunt-button#btn-browse-channels-trailing(v-if="worldHasTextChannels", @click="showChannelBrowser = true") {{ $t('RoomsSidebar:browse-channels-button:label') }}
 			.group-title#dm-title(v-if="hasPermission('world:chat.direct')")
 				span {{ $t('RoomsSidebar:direct-messages-headline:text') }}
-				bunt-icon-button(tooltip="open a direct message", :tooltip-fixed="true", @click="showDMCreationPrompt = true") plus
+				bunt-icon-button(v-if="hasPermission('world:chat.direct')", tooltip="open a direct message", :tooltip-fixed="true", @click="showDMCreationPrompt = true") plus
 			.direct-messages(v-if="hasPermission('world:chat.direct') && directMessageChannels.length", role="group", aria-describedby="dm-title")
 				router-link.direct-message(v-for="channel of directMessageChannels", :to="{name: 'channel', params: {channelId: channel.id}}", :class="{unread: hasUnreadMessages(channel.id)}")
 					i.bunt-icon.mdi(v-if="call && call.channel === channel.id", aria-hidden="true").mdi-phone
@@ -79,7 +79,7 @@ transition(name="sidebar")
 			channel-browser(v-if="showChannelBrowser", @close="showChannelBrowser = false", @createChannel="showChannelBrowser = false, showChatCreationPrompt = true")
 			create-stage-prompt(v-else-if="showStageCreationPrompt", @close="showStageCreationPrompt = false")
 			create-chat-prompt(v-else-if="showChatCreationPrompt", @close="showChatCreationPrompt = false")
-			create-dm-prompt(v-else-if="showDMCreationPrompt", @close="showDMCreationPrompt = false")
+			create-dm-prompt(v-else-if="showDMCreationPrompt && hasPermission('world:chat.direct')", @close="showDMCreationPrompt = false")
 </template>
 <script>
 import { mapState, mapGetters } from 'vuex'
@@ -165,6 +165,10 @@ export default {
 			return rooms
 		},
 		directMessageChannels() {
+			// Only show direct message channels if user has explicit permission
+			if (!this.hasPermission('world:chat.direct')) {
+				return []
+			}
 			return this.joinedChannels
 				?.filter(channel => channel.members)
 				.map(channel => {

app/eventyay/webapp/src/views/admin/config/CreateRoomPrompt.vue

@@ -47,7 +47,6 @@ export default {
 				this.$router.push({name: 'admin:rooms:item', params: {roomId: room}})
 				this.$emit('close')
 			} catch (error) {
-				console.log(error)
 				this.loading = false
 				this.error = error.message || error
 			}