Skip to content

Commit 7dc6259

Browse files
committed
All guests can be moderators
This patch also modifies the container images build to push to the gh-registry.
1 parent ba44eb1 commit 7dc6259

File tree

4 files changed

+11
-34
lines changed

4 files changed

+11
-34
lines changed

.github/workflows/ci-docker.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ name: CI Docker build
22

33
on:
44
workflow_dispatch:
5-
release:
6-
types: [published]
5+
# release:
6+
# types: [published]
77
push:
88
branches:
9-
- develop
10-
- "[0-9].x"
9+
- guest-mods
1110
jobs:
1211
build-and-push-image:
1312
runs-on: ubuntu-latest
@@ -21,12 +20,12 @@ jobs:
2120

2221
- name: Set up Docker Buildx
2322
uses: docker/setup-buildx-action@v3
24-
25-
- name: Login to Docker Hub
26-
uses: docker/login-action@v2.0.0
23+
- name: Log in to the Container registry
24+
uses: docker/login-action@v3
2725
with:
28-
username: ${{ secrets.DOCKER_HUB_USERNAME }}
29-
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
26+
registry: ghcr.io
27+
username: ${{ github.actor }}
28+
password: ${{ secrets.GITHUB_TOKEN }}
3029

3130
- name: Extract metadata (tags, labels) for Docker
3231
id: meta
@@ -59,5 +58,4 @@ jobs:
5958
push: true
6059
tags: ${{ steps.meta.outputs.tags }}
6160
labels: ${{ steps.meta.outputs.labels }}
62-
cache-from: type=registry,ref=pilos/pilos:buildcache
63-
cache-to: type=registry,ref=pilos/pilos:buildcache,mode=max
61+

app/Models/Room.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ protected function casts()
136136
'lobby' => [
137137
'cast' => RoomLobby::class,
138138
'expert' => true,
139+
'only' => [RoomLobby::ENABLED, RoomLobby::DISABLED],
139140
],
140141
'visibility' => [
141142
'cast' => RoomVisibility::class,
@@ -358,6 +359,7 @@ public function getRole(?User $user, ?RoomToken $token): RoomUserRole
358359
}
359360

360361
return RoomUserRole::GUEST;
362+
return $this->getRoomSetting('default_role');
361363
}
362364

363365
if ($this->owner->is($user) || $user->can('rooms.manage')) {

resources/js/components/RoomTabSettings.vue

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,6 @@ const form = computed(() => {
215215
options: [
216216
{ value: 0, label: t("app.disabled") },
217217
{ value: 1, label: t("app.enabled") },
218-
{
219-
value: 2,
220-
label: t(
221-
"rooms.settings.video_conference.lobby.only_for_guests_enabled",
222-
),
223-
},
224218
],
225219
component: RoomTabSettingsRadioGroup,
226220
warningMessage: lobbyAlert.value,

resources/js/views/AdminRoomTypesView.vue

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -564,23 +564,6 @@
564564
/>
565565
<label for="lobby-enabled">{{ $t("app.enabled") }}</label>
566566
</div>
567-
<div
568-
class="flex items-center gap-2"
569-
data-test="lobby-only-for-guests-field"
570-
>
571-
<RadioButton
572-
v-model.number="model.lobby_default"
573-
:disabled="isBusy || modelLoadingError || viewOnly"
574-
:value="2"
575-
name="lobby"
576-
input-id="lobby-only-for-guests"
577-
/>
578-
<label for="lobby-only-for-guests">{{
579-
$t(
580-
"rooms.settings.video_conference.lobby.only_for_guests_enabled",
581-
)
582-
}}</label>
583-
</div>
584567
</div>
585568
<ToggleButton
586569
v-model="model.lobby_enforced"

0 commit comments

Comments
 (0)