Skip to content

Commit 652b4a9

Browse files
committed
All guests can be moderators
This patch also modifies the container images build to push to the gh-registry.
1 parent 77ccbe3 commit 652b4a9

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 & 10 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
@@ -22,17 +21,18 @@ jobs:
2221
- name: Set up Docker Buildx
2322
uses: docker/setup-buildx-action@v3
2423

25-
- name: Login to Docker Hub
24+
- name: Log in to the Container registry
2625
uses: docker/login-action@v3
2726
with:
28-
username: ${{ secrets.DOCKER_HUB_USERNAME }}
29-
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
27+
registry: ghcr.io
28+
username: ${{ github.actor }}
29+
password: ${{ secrets.GITHUB_TOKEN }}
3030

3131
- name: Extract metadata (tags, labels) for Docker
3232
id: meta
3333
uses: docker/metadata-action@v5
3434
with:
35-
images: pilos/pilos
35+
images: ghcr.io/${{ github.repository }}
3636
flavor: |
3737
latest=auto
3838
prefix=
@@ -59,5 +59,4 @@ jobs:
5959
push: true
6060
tags: ${{ steps.meta.outputs.tags }}
6161
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
62+

app/Models/Room.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ protected function casts()
135135
'lobby' => [
136136
'cast' => RoomLobby::class,
137137
'expert' => true,
138+
'only' => [RoomLobby::ENABLED, RoomLobby::DISABLED],
138139
],
139140
'visibility' => [
140141
'cast' => RoomVisibility::class,
@@ -356,7 +357,7 @@ public function getRole(?User $user, ?RoomToken $token): RoomUserRole
356357
return $token->role;
357358
}
358359

359-
return RoomUserRole::GUEST;
360+
return $this->getRoomSetting('default_role');
360361
}
361362

362363
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
@@ -216,12 +216,6 @@ const form = computed(() => {
216216
options: [
217217
{ value: 0, label: t("app.disabled") },
218218
{ value: 1, label: t("app.enabled") },
219-
{
220-
value: 2,
221-
label: t(
222-
"rooms.settings.video_conference.lobby.only_for_guests_enabled",
223-
),
224-
},
225219
],
226220
component: RoomTabSettingsRadioGroup,
227221
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)