kopia lustrzana https://codeberg.org/nmkj/audon
support changing title, description and restriction
Namekuji
rodzic
ba94dcf409
commit
9d7176543f
|
|
@ -1,43 +0,0 @@
|
|||
<script setup>
|
||||
defineProps({
|
||||
msg: {
|
||||
type: String,
|
||||
required: true
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="greetings">
|
||||
<h1 class="green">{{ msg }}</h1>
|
||||
<h3>
|
||||
You’ve successfully created a project with
|
||||
<a href="https://vitejs.dev/" target="_blank" rel="noopener">Vite</a> +
|
||||
<a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a>.
|
||||
</h3>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
h1 {
|
||||
font-weight: 500;
|
||||
font-size: 2.6rem;
|
||||
top: -10px;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.greetings h1,
|
||||
.greetings h3 {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
.greetings h1,
|
||||
.greetings h3 {
|
||||
text-align: left;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
<script setup>
|
||||
import WelcomeItem from './WelcomeItem.vue'
|
||||
import DocumentationIcon from './icons/IconDocumentation.vue'
|
||||
import ToolingIcon from './icons/IconTooling.vue'
|
||||
import EcosystemIcon from './icons/IconEcosystem.vue'
|
||||
import CommunityIcon from './icons/IconCommunity.vue'
|
||||
import SupportIcon from './icons/IconSupport.vue'
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<WelcomeItem>
|
||||
<template #icon>
|
||||
<DocumentationIcon />
|
||||
</template>
|
||||
<template #heading>Documentation</template>
|
||||
|
||||
Vue’s
|
||||
<a href="https://vuejs.org/" target="_blank" rel="noopener">official documentation</a>
|
||||
provides you with all information you need to get started.
|
||||
</WelcomeItem>
|
||||
|
||||
<WelcomeItem>
|
||||
<template #icon>
|
||||
<ToolingIcon />
|
||||
</template>
|
||||
<template #heading>Tooling</template>
|
||||
|
||||
This project is served and bundled with
|
||||
<a href="https://vitejs.dev/guide/features.html" target="_blank" rel="noopener">Vite</a>. The
|
||||
recommended IDE setup is
|
||||
<a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a> +
|
||||
<a href="https://github.com/johnsoncodehk/volar" target="_blank" rel="noopener">Volar</a>. If
|
||||
you need to test your components and web pages, check out
|
||||
<a href="https://www.cypress.io/" target="_blank" rel="noopener">Cypress</a> and
|
||||
<a href="https://on.cypress.io/component" target="_blank">Cypress Component Testing</a>.
|
||||
|
||||
<br />
|
||||
|
||||
More instructions are available in <code>README.md</code>.
|
||||
</WelcomeItem>
|
||||
|
||||
<WelcomeItem>
|
||||
<template #icon>
|
||||
<EcosystemIcon />
|
||||
</template>
|
||||
<template #heading>Ecosystem</template>
|
||||
|
||||
Get official tools and libraries for your project:
|
||||
<a href="https://pinia.vuejs.org/" target="_blank" rel="noopener">Pinia</a>,
|
||||
<a href="https://router.vuejs.org/" target="_blank" rel="noopener">Vue Router</a>,
|
||||
<a href="https://test-utils.vuejs.org/" target="_blank" rel="noopener">Vue Test Utils</a>, and
|
||||
<a href="https://github.com/vuejs/devtools" target="_blank" rel="noopener">Vue Dev Tools</a>. If
|
||||
you need more resources, we suggest paying
|
||||
<a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">Awesome Vue</a>
|
||||
a visit.
|
||||
</WelcomeItem>
|
||||
|
||||
<WelcomeItem>
|
||||
<template #icon>
|
||||
<CommunityIcon />
|
||||
</template>
|
||||
<template #heading>Community</template>
|
||||
|
||||
Got stuck? Ask your question on
|
||||
<a href="https://chat.vuejs.org" target="_blank" rel="noopener">Vue Land</a>, our official
|
||||
Discord server, or
|
||||
<a href="https://stackoverflow.com/questions/tagged/vue.js" target="_blank" rel="noopener"
|
||||
>StackOverflow</a
|
||||
>. You should also subscribe to
|
||||
<a href="https://news.vuejs.org" target="_blank" rel="noopener">our mailing list</a> and follow
|
||||
the official
|
||||
<a href="https://twitter.com/vuejs" target="_blank" rel="noopener">@vuejs</a>
|
||||
twitter account for latest news in the Vue world.
|
||||
</WelcomeItem>
|
||||
|
||||
<WelcomeItem>
|
||||
<template #icon>
|
||||
<SupportIcon />
|
||||
</template>
|
||||
<template #heading>Support Vue</template>
|
||||
|
||||
As an independent project, Vue relies on community backing for its sustainability. You can help
|
||||
us by
|
||||
<a href="https://vuejs.org/sponsor/" target="_blank" rel="noopener">becoming a sponsor</a>.
|
||||
</WelcomeItem>
|
||||
</template>
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
<template>
|
||||
<div class="item">
|
||||
<i>
|
||||
<slot name="icon"></slot>
|
||||
</i>
|
||||
<div class="details">
|
||||
<h3>
|
||||
<slot name="heading"></slot>
|
||||
</h3>
|
||||
<slot></slot>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.item {
|
||||
margin-top: 2rem;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.details {
|
||||
flex: 1;
|
||||
margin-left: 1rem;
|
||||
}
|
||||
|
||||
i {
|
||||
display: flex;
|
||||
place-items: center;
|
||||
place-content: center;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
color: var(--color-text);
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 1.2rem;
|
||||
font-weight: 500;
|
||||
margin-bottom: 0.4rem;
|
||||
color: var(--color-heading);
|
||||
}
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
.item {
|
||||
margin-top: 0;
|
||||
padding: 0.4rem 0 1rem calc(var(--section-gap) / 2);
|
||||
}
|
||||
|
||||
i {
|
||||
top: calc(50% - 25px);
|
||||
left: -26px;
|
||||
position: absolute;
|
||||
border: 1px solid var(--color-border);
|
||||
background: var(--color-background);
|
||||
border-radius: 8px;
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
}
|
||||
|
||||
.item:before {
|
||||
content: ' ';
|
||||
border-left: 1px solid var(--color-border);
|
||||
position: absolute;
|
||||
left: 0;
|
||||
bottom: calc(50% + 25px);
|
||||
height: calc(50% - 25px);
|
||||
}
|
||||
|
||||
.item:after {
|
||||
content: ' ';
|
||||
border-left: 1px solid var(--color-border);
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: calc(50% + 25px);
|
||||
height: calc(50% - 25px);
|
||||
}
|
||||
|
||||
.item:first-of-type:before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.item:last-of-type:after {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<template>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
|
||||
<path
|
||||
d="M15 4a1 1 0 1 0 0 2V4zm0 11v-1a1 1 0 0 0-1 1h1zm0 4l-.707.707A1 1 0 0 0 16 19h-1zm-4-4l.707-.707A1 1 0 0 0 11 14v1zm-4.707-1.293a1 1 0 0 0-1.414 1.414l1.414-1.414zm-.707.707l-.707-.707.707.707zM9 11v-1a1 1 0 0 0-.707.293L9 11zm-4 0h1a1 1 0 0 0-1-1v1zm0 4H4a1 1 0 0 0 1.707.707L5 15zm10-9h2V4h-2v2zm2 0a1 1 0 0 1 1 1h2a3 3 0 0 0-3-3v2zm1 1v6h2V7h-2zm0 6a1 1 0 0 1-1 1v2a3 3 0 0 0 3-3h-2zm-1 1h-2v2h2v-2zm-3 1v4h2v-4h-2zm1.707 3.293l-4-4-1.414 1.414 4 4 1.414-1.414zM11 14H7v2h4v-2zm-4 0c-.276 0-.525-.111-.707-.293l-1.414 1.414C5.42 15.663 6.172 16 7 16v-2zm-.707 1.121l3.414-3.414-1.414-1.414-3.414 3.414 1.414 1.414zM9 12h4v-2H9v2zm4 0a3 3 0 0 0 3-3h-2a1 1 0 0 1-1 1v2zm3-3V3h-2v6h2zm0-6a3 3 0 0 0-3-3v2a1 1 0 0 1 1 1h2zm-3-3H3v2h10V0zM3 0a3 3 0 0 0-3 3h2a1 1 0 0 1 1-1V0zM0 3v6h2V3H0zm0 6a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1H0zm3 3h2v-2H3v2zm1-1v4h2v-4H4zm1.707 4.707l.586-.586-1.414-1.414-.586.586 1.414 1.414z"
|
||||
/>
|
||||
</svg>
|
||||
</template>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<template>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" fill="currentColor">
|
||||
<path
|
||||
d="M11 2.253a1 1 0 1 0-2 0h2zm-2 13a1 1 0 1 0 2 0H9zm.447-12.167a1 1 0 1 0 1.107-1.666L9.447 3.086zM1 2.253L.447 1.42A1 1 0 0 0 0 2.253h1zm0 13H0a1 1 0 0 0 1.553.833L1 15.253zm8.447.833a1 1 0 1 0 1.107-1.666l-1.107 1.666zm0-14.666a1 1 0 1 0 1.107 1.666L9.447 1.42zM19 2.253h1a1 1 0 0 0-.447-.833L19 2.253zm0 13l-.553.833A1 1 0 0 0 20 15.253h-1zm-9.553-.833a1 1 0 1 0 1.107 1.666L9.447 14.42zM9 2.253v13h2v-13H9zm1.553-.833C9.203.523 7.42 0 5.5 0v2c1.572 0 2.961.431 3.947 1.086l1.107-1.666zM5.5 0C3.58 0 1.797.523.447 1.42l1.107 1.666C2.539 2.431 3.928 2 5.5 2V0zM0 2.253v13h2v-13H0zm1.553 13.833C2.539 15.431 3.928 15 5.5 15v-2c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM5.5 15c1.572 0 2.961.431 3.947 1.086l1.107-1.666C9.203 13.523 7.42 13 5.5 13v2zm5.053-11.914C11.539 2.431 12.928 2 14.5 2V0c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM14.5 2c1.573 0 2.961.431 3.947 1.086l1.107-1.666C18.203.523 16.421 0 14.5 0v2zm3.5.253v13h2v-13h-2zm1.553 12.167C18.203 13.523 16.421 13 14.5 13v2c1.573 0 2.961.431 3.947 1.086l1.107-1.666zM14.5 13c-1.92 0-3.703.523-5.053 1.42l1.107 1.666C11.539 15.431 12.928 15 14.5 15v-2z"
|
||||
/>
|
||||
</svg>
|
||||
</template>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<template>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" fill="currentColor">
|
||||
<path
|
||||
d="M11.447 8.894a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm0 1.789a1 1 0 1 0 .894-1.789l-.894 1.789zM7.447 7.106a1 1 0 1 0-.894 1.789l.894-1.789zM10 9a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0H8zm9.447-5.606a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm2 .789a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zM18 5a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0h-2zm-5.447-4.606a1 1 0 1 0 .894-1.789l-.894 1.789zM9 1l.447-.894a1 1 0 0 0-.894 0L9 1zm-2.447.106a1 1 0 1 0 .894 1.789l-.894-1.789zm-6 3a1 1 0 1 0 .894 1.789L.553 4.106zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zm-2-.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 2.789a1 1 0 1 0 .894-1.789l-.894 1.789zM2 5a1 1 0 1 0-2 0h2zM0 7.5a1 1 0 1 0 2 0H0zm8.553 12.394a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 1a1 1 0 1 0 .894 1.789l-.894-1.789zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zM8 19a1 1 0 1 0 2 0H8zm2-2.5a1 1 0 1 0-2 0h2zm-7.447.394a1 1 0 1 0 .894-1.789l-.894 1.789zM1 15H0a1 1 0 0 0 .553.894L1 15zm1-2.5a1 1 0 1 0-2 0h2zm12.553 2.606a1 1 0 1 0 .894 1.789l-.894-1.789zM17 15l.447.894A1 1 0 0 0 18 15h-1zm1-2.5a1 1 0 1 0-2 0h2zm-7.447-5.394l-2 1 .894 1.789 2-1-.894-1.789zm-1.106 1l-2-1-.894 1.789 2 1 .894-1.789zM8 9v2.5h2V9H8zm8.553-4.894l-2 1 .894 1.789 2-1-.894-1.789zm.894 0l-2-1-.894 1.789 2 1 .894-1.789zM16 5v2.5h2V5h-2zm-4.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zm-2.894-1l-2 1 .894 1.789 2-1L8.553.106zM1.447 5.894l2-1-.894-1.789-2 1 .894 1.789zm-.894 0l2 1 .894-1.789-2-1-.894 1.789zM0 5v2.5h2V5H0zm9.447 13.106l-2-1-.894 1.789 2 1 .894-1.789zm0 1.789l2-1-.894-1.789-2 1 .894 1.789zM10 19v-2.5H8V19h2zm-6.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zM2 15v-2.5H0V15h2zm13.447 1.894l2-1-.894-1.789-2 1 .894 1.789zM18 15v-2.5h-2V15h2z"
|
||||
/>
|
||||
</svg>
|
||||
</template>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<template>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
|
||||
<path
|
||||
d="M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.666.105 5.5 5.5 0 0 0-.114 7.665L10 18.78l8.39-8.4a5.5 5.5 0 0 0-.114-7.665 5.5 5.5 0 0 0-7.666-.105l-.61.61z"
|
||||
/>
|
||||
</svg>
|
||||
</template>
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
<!-- This icon is from <https://github.com/Templarian/MaterialDesign>, distributed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) license-->
|
||||
<template>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
aria-hidden="true"
|
||||
role="img"
|
||||
class="iconify iconify--mdi"
|
||||
width="24"
|
||||
height="24"
|
||||
preserveAspectRatio="xMidYMid meet"
|
||||
viewBox="0 0 24 24"
|
||||
>
|
||||
<path
|
||||
d="M20 18v-4h-3v1h-2v-1H9v1H7v-1H4v4h16M6.33 8l-1.74 4H7v-1h2v1h6v-1h2v1h2.41l-1.74-4H6.33M9 5v1h6V5H9m12.84 7.61c.1.22.16.48.16.8V18c0 .53-.21 1-.6 1.41c-.4.4-.85.59-1.4.59H4c-.55 0-1-.19-1.4-.59C2.21 19 2 18.53 2 18v-4.59c0-.32.06-.58.16-.8L4.5 7.22C4.84 6.41 5.45 6 6.33 6H7V5c0-.55.18-1 .57-1.41C7.96 3.2 8.44 3 9 3h6c.56 0 1.04.2 1.43.59c.39.41.57.86.57 1.41v1h.67c.88 0 1.49.41 1.83 1.22l2.34 5.39z"
|
||||
fill="currentColor"
|
||||
></path>
|
||||
</svg>
|
||||
</template>
|
||||
|
|
@ -11,7 +11,7 @@ import {
|
|||
import { useVuelidate } from "@vuelidate/core";
|
||||
import { useClipboard } from "@vueuse/core";
|
||||
import { useMastodonStore } from "../stores/mastodon";
|
||||
import { helpers, required } from "@vuelidate/validators";
|
||||
import { helpers, maxLength, required } from "@vuelidate/validators";
|
||||
import { debounce, some, map, truncate, trim } from "lodash-es";
|
||||
import { login } from "masto";
|
||||
import { webfinger } from "../assets/utils";
|
||||
|
|
@ -70,7 +70,11 @@ export default {
|
|||
return {
|
||||
title: {
|
||||
required: helpers.withMessage("部屋の名前を入力してください", required),
|
||||
maxLength: maxLength(100)
|
||||
},
|
||||
description: {
|
||||
maxLength: maxLength(500)
|
||||
}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -91,7 +95,7 @@ export default {
|
|||
if (!donURL) return "";
|
||||
const url = new URL(donURL);
|
||||
const texts = [
|
||||
`Audon で部屋を作りました！\n参加用リンク: ${this.roomURL}`,
|
||||
`#Audon で部屋を作りました！\n参加用リンク: ${this.roomURL}`,
|
||||
`タイトル：${this.title}`,
|
||||
];
|
||||
if (this.description)
|
||||
|
|
@ -252,6 +256,7 @@ export default {
|
|||
<v-text-field
|
||||
v-model="title"
|
||||
label="タイトル"
|
||||
:counter="100"
|
||||
:error-messages="titleErrors"
|
||||
required
|
||||
@input="v$.title.$touch()"
|
||||
|
|
@ -262,6 +267,7 @@ export default {
|
|||
v-model="description"
|
||||
rows="2"
|
||||
label="説明"
|
||||
:counter="500"
|
||||
></v-textarea>
|
||||
<v-select
|
||||
:items="relOptions"
|
||||
|
|
@ -269,14 +275,7 @@ export default {
|
|||
v-model="relationship"
|
||||
:messages="['共同ホストは制限に関わらず入室できます']"
|
||||
></v-select>
|
||||
<v-text-field
|
||||
type="datetime-local"
|
||||
v-model="scheduledAt"
|
||||
label="開始予約"
|
||||
disabled
|
||||
:messages="['今後のアップデートで追加予定']"
|
||||
></v-text-field>
|
||||
<v-card class="mt-3" variant="outlined">
|
||||
<v-card class="my-3" variant="outlined">
|
||||
<v-card-title class="text-subtitle-1">共同ホスト</v-card-title>
|
||||
<v-card-text v-if="cohosts.length > 0 || searchResult" class="py-0">
|
||||
<template v-if="cohosts.length > 0">
|
||||
|
|
@ -355,6 +354,13 @@ export default {
|
|||
</v-text-field>
|
||||
</v-card-actions>
|
||||
</v-card>
|
||||
<v-text-field
|
||||
type="datetime-local"
|
||||
v-model="scheduledAt"
|
||||
label="開始予約"
|
||||
disabled
|
||||
:messages="['今後のアップデートで追加予定']"
|
||||
></v-text-field>
|
||||
</v-form>
|
||||
</v-card-text>
|
||||
<v-card-actions>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
import axios from "axios";
|
||||
import { pushNotFound, webfinger } from "../assets/utils";
|
||||
import { useMastodonStore } from "../stores/mastodon";
|
||||
import { map, some, omit, filter } from "lodash-es";
|
||||
import { map, some, omit, filter, trim, clone } from "lodash-es";
|
||||
import Participant from "../components/Participant.vue";
|
||||
import {
|
||||
mdiMicrophone,
|
||||
|
|
@ -14,6 +14,8 @@ import {
|
|||
mdiCheck,
|
||||
mdiAccountVoice,
|
||||
mdiLogout,
|
||||
mdiDotsVertical,
|
||||
mdiPencil,
|
||||
} from "@mdi/js";
|
||||
import {
|
||||
Room,
|
||||
|
|
@ -24,6 +26,8 @@ import {
|
|||
AudioPresets,
|
||||
} from "livekit-client";
|
||||
import { login } from "masto";
|
||||
import { useVuelidate } from "@vuelidate/core";
|
||||
import { helpers, maxLength, required } from "@vuelidate/validators";
|
||||
|
||||
const publishOpts = {
|
||||
audioBitrate: AudioPresets.music,
|
||||
|
|
@ -41,6 +45,7 @@ const captureOpts = {
|
|||
export default {
|
||||
setup() {
|
||||
return {
|
||||
v$: useVuelidate(),
|
||||
donStore: useMastodonStore(),
|
||||
decoder: new TextDecoder(),
|
||||
encoder: new TextEncoder(),
|
||||
|
|
@ -49,6 +54,22 @@ export default {
|
|||
components: {
|
||||
Participant,
|
||||
},
|
||||
validations() {
|
||||
return {
|
||||
editingRoomInfo: {
|
||||
title: {
|
||||
required: helpers.withMessage(
|
||||
"部屋の名前を入力してください",
|
||||
required
|
||||
),
|
||||
maxLength: maxLength(100),
|
||||
},
|
||||
description: {
|
||||
maxLength: maxLength(500),
|
||||
},
|
||||
},
|
||||
};
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
mdiLogout,
|
||||
|
|
@ -60,6 +81,8 @@ export default {
|
|||
mdiVolumeOff,
|
||||
mdiClose,
|
||||
mdiCheck,
|
||||
mdiDotsVertical,
|
||||
mdiPencil,
|
||||
roomID: this.$route.params.id,
|
||||
loading: false,
|
||||
mainHeight: 600,
|
||||
|
|
@ -67,11 +90,25 @@ export default {
|
|||
roomInfo: {
|
||||
title: "",
|
||||
description: "",
|
||||
restriction: "",
|
||||
host: null,
|
||||
cohosts: [],
|
||||
speakers: [],
|
||||
createdAt: null,
|
||||
},
|
||||
editingRoomInfo: {
|
||||
title: "",
|
||||
description: "",
|
||||
restriction: "",
|
||||
},
|
||||
relOptions: [
|
||||
{ title: "制限なし", value: "everyone" },
|
||||
{ title: "あなたのフォロー限定", value: "following" },
|
||||
{ title: "あなたのフォロワー限定", value: "follower" },
|
||||
{ title: "あなたのフォローまたはフォロワー限定", value: "knowing" },
|
||||
{ title: "あなたの相互フォロー限定", value: "mutual" },
|
||||
{ title: "共同ホスト限定", value: "private" },
|
||||
],
|
||||
participants: {},
|
||||
cachedMastoData: {},
|
||||
activeSpeakerIDs: new Set(),
|
||||
|
|
@ -82,6 +119,8 @@ export default {
|
|||
showRequestNotification: false,
|
||||
showRequestDialog: false,
|
||||
showRequestedNotification: false,
|
||||
isEditLoading: false,
|
||||
showEditDialog: false,
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -135,6 +174,11 @@ export default {
|
|||
}
|
||||
return mdiMicrophone;
|
||||
},
|
||||
titleErrors() {
|
||||
const errors = this.v$.editingRoomInfo.title.$errors;
|
||||
const messages = map(errors, (e) => e.$message);
|
||||
return messages;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
webfinger,
|
||||
|
|
@ -248,6 +292,8 @@ export default {
|
|||
})
|
||||
.on(RoomEvent.RoomMetadataChanged, (metadata) => {
|
||||
self.roomInfo = JSON.parse(metadata);
|
||||
self.editingRoomInfo = clone(self.roomInfo);
|
||||
if (!self.roomInfo.speakers) return;
|
||||
for (const speakers of self.roomInfo.speakers) {
|
||||
self.speakRequests.delete(speakers.audon_id);
|
||||
}
|
||||
|
|
@ -262,6 +308,7 @@ export default {
|
|||
await room.connect(resp.data.url, resp.data.token);
|
||||
this.roomClient = room;
|
||||
this.roomInfo = JSON.parse(room.metadata);
|
||||
this.editingRoomInfo = clone(this.roomInfo);
|
||||
this.addParticipant(room.localParticipant);
|
||||
for (const part of room.participants.values()) {
|
||||
this.addParticipant(part);
|
||||
|
|
@ -478,11 +525,76 @@ export default {
|
|||
await this.roomClient.disconnect();
|
||||
}
|
||||
},
|
||||
async onEditSubmit() {
|
||||
this.editingRoomInfo.title = trim(this.editingRoomInfo.title);
|
||||
this.editingRoomInfo.description = trim(this.editingRoomInfo.description);
|
||||
const isFormCorrect = await this.v$.$validate();
|
||||
if (!isFormCorrect) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.isEditLoading = true;
|
||||
|
||||
try {
|
||||
const payload = {
|
||||
title: this.editingRoomInfo.title,
|
||||
description: this.editingRoomInfo.description,
|
||||
restriction: this.editingRoomInfo.restriction,
|
||||
};
|
||||
await axios.patch(`/api/room/${this.roomID}`, payload);
|
||||
} catch (error) {
|
||||
alert(error);
|
||||
} finally {
|
||||
this.isEditLoading = false;
|
||||
this.showEditDialog = false;
|
||||
}
|
||||
},
|
||||
clone,
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<v-dialog v-model="showEditDialog" max-width="500" persistent>
|
||||
<v-card>
|
||||
<v-card-title>部屋の編集</v-card-title>
|
||||
<v-card-text>
|
||||
<v-text-field
|
||||
v-model="editingRoomInfo.title"
|
||||
label="タイトル"
|
||||
:error-messages="titleErrors"
|
||||
:counter="100"
|
||||
required
|
||||
@input="v$.editingRoomInfo.title.$touch()"
|
||||
@blur="v$.editingRoomInfo.title.$touch()"
|
||||
></v-text-field>
|
||||
<v-textarea
|
||||
auto-grow
|
||||
v-model="editingRoomInfo.description"
|
||||
rows="2"
|
||||
label="説明"
|
||||
:counter="500"
|
||||
></v-textarea>
|
||||
<v-select
|
||||
:items="relOptions"
|
||||
label="入室制限"
|
||||
v-model="editingRoomInfo.restriction"
|
||||
:messages="['共同ホストは制限に関わらず入室できます']"
|
||||
></v-select>
|
||||
</v-card-text>
|
||||
<v-divider></v-divider>
|
||||
<v-card-actions class="justify-end">
|
||||
<v-btn
|
||||
@click="
|
||||
showEditDialog = false;
|
||||
editingRoomInfo = clone(roomInfo);
|
||||
"
|
||||
>キャンセル</v-btn
|
||||
>
|
||||
<v-btn @click="onEditSubmit">保存</v-btn>
|
||||
</v-card-actions>
|
||||
</v-card>
|
||||
</v-dialog>
|
||||
<v-dialog v-model="autoplayDisabled" max-width="500" persistent>
|
||||
<v-alert color="indigo">
|
||||
<div class="mb-5">
|
||||
|
|
@ -590,18 +702,32 @@ export default {
|
|||
<div class="d-none" ref="audioDOM"></div>
|
||||
<main class="fill-height" v-resize="onResize">
|
||||
<v-card :height="mainHeight" :loading="loading" class="d-flex flex-column">
|
||||
<v-card-title class="d-flex justify-space-between">
|
||||
<v-card-title class="d-flex justify-space-between align-center">
|
||||
<div>{{ roomInfo.title }}</div>
|
||||
<div>
|
||||
<v-btn
|
||||
v-if="iamHost"
|
||||
:append-icon="mdiDoorClosed"
|
||||
variant="outlined"
|
||||
color="red"
|
||||
@click="onRoomClose"
|
||||
>
|
||||
閉室
|
||||
</v-btn>
|
||||
<div v-if="iamHost">
|
||||
<v-menu>
|
||||
<template v-slot:activator="{ props }">
|
||||
<v-btn
|
||||
size="small"
|
||||
variant="text"
|
||||
color="white"
|
||||
:icon="mdiDotsVertical"
|
||||
v-bind="props"
|
||||
></v-btn>
|
||||
</template>
|
||||
<v-list>
|
||||
<v-list-item
|
||||
title="編集"
|
||||
:prepend-icon="mdiPencil"
|
||||
@click="showEditDialog = true"
|
||||
></v-list-item>
|
||||
<v-list-item
|
||||
title="閉室"
|
||||
:prepend-icon="mdiDoorClosed"
|
||||
@click="onRoomClose"
|
||||
></v-list-item>
|
||||
</v-list>
|
||||
</v-menu>
|
||||
</div>
|
||||
</v-card-title>
|
||||
<div
|
||||
|
|
|
|||
63
room.go
63
room.go
|
|
@ -92,6 +92,67 @@ func createRoomHandler(c echo.Context) error {
|
|||
return c.String(http.StatusCreated, room.RoomID)
|
||||
}
|
||||
|
||||
type RoomUpdateRequest struct {
|
||||
Title string `bson:"title" json:"title" validate:"required,max=100,printascii|multibyte"`
|
||||
Description string `bson:"description" json:"description" validate:"max=500,ascii|multibyte"`
|
||||
Restriction JoinRestriction `bson:"restriction" json:"restriction"`
|
||||
}
|
||||
|
||||
func updateRoomHandler(c echo.Context) (err error) {
|
||||
roomID := c.Param("id")
|
||||
if err := mainValidator.Var(&roomID, "required,printascii"); err != nil {
|
||||
return wrapValidationError(err)
|
||||
}
|
||||
|
||||
user := c.Get("user").(*AudonUser)
|
||||
|
||||
var room *RoomMetadata
|
||||
lkRoom, _ := getRoomInLivekit(c.Request().Context(), roomID)
|
||||
if lkRoom != nil {
|
||||
room, _ = getRoomMetadataFromLivekitRoom(lkRoom)
|
||||
} else {
|
||||
dbRoom, err := findRoomByID(c.Request().Context(), roomID)
|
||||
if err != nil {
|
||||
return ErrRoomNotFound
|
||||
}
|
||||
room = new(RoomMetadata)
|
||||
room.Room = dbRoom
|
||||
}
|
||||
|
||||
if !room.IsHost(user) {
|
||||
return ErrOperationNotPermitted
|
||||
}
|
||||
|
||||
req := new(RoomUpdateRequest)
|
||||
if err = c.Bind(req); err != nil {
|
||||
return ErrInvalidRequestFormat
|
||||
}
|
||||
if err = mainValidator.Struct(req); err != nil {
|
||||
return wrapValidationError(err)
|
||||
}
|
||||
|
||||
coll := mainDB.Collection(COLLECTION_ROOM)
|
||||
if _, err = coll.UpdateOne(c.Request().Context(),
|
||||
bson.D{{Key: "room_id", Value: roomID}},
|
||||
bson.D{{Key: "$set", Value: req}}); err != nil {
|
||||
c.Logger().Error(err)
|
||||
return echo.NewHTTPError(http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
if lkRoom != nil {
|
||||
room.Title = req.Title
|
||||
room.Description = req.Description
|
||||
room.Restriction = req.Restriction
|
||||
newMetadata, _ := json.Marshal(room)
|
||||
if _, err := lkRoomServiceClient.UpdateRoomMetadata(c.Request().Context(), &livekit.UpdateRoomMetadataRequest{Room: roomID, Metadata: string(newMetadata)}); err != nil {
|
||||
c.Logger().Error(err)
|
||||
return echo.NewHTTPError(http.StatusInternalServerError)
|
||||
}
|
||||
}
|
||||
|
||||
return c.JSON(http.StatusOK, room)
|
||||
}
|
||||
|
||||
func joinRoomHandler(c echo.Context) (err error) {
|
||||
roomID := c.Param("id")
|
||||
if err := mainValidator.Var(&roomID, "required,printascii"); err != nil {
|
||||
|
|
@ -102,7 +163,7 @@ func joinRoomHandler(c echo.Context) (err error) {
|
|||
|
||||
room, err := findRoomByID(c.Request().Context(), roomID)
|
||||
if err != nil {
|
||||
return echo.NewHTTPError(http.StatusNotFound)
|
||||
return ErrRoomNotFound
|
||||
}
|
||||
|
||||
// decline the request if user is already in the room
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ type (
|
|||
Title string `bson:"title" json:"title" validate:"required,max=100,printascii|multibyte"`
|
||||
Description string `bson:"description" json:"description" validate:"max=500,ascii|multibyte"`
|
||||
Host *AudonUser `bson:"host" json:"host"`
|
||||
CoHosts []*AudonUser `bson:"cohost" json:"cohosts"`
|
||||
Restriction JoinRestriction `bsong:"restriction" json:"restriction"`
|
||||
CoHosts []*AudonUser `bson:"cohosts" json:"cohosts"`
|
||||
Restriction JoinRestriction `bson:"restriction" json:"restriction"`
|
||||
Kicked []*AudonUser `bson:"kicked" json:"kicked"`
|
||||
ScheduledAt time.Time `bson:"scheduled_at" json:"scheduled_at"`
|
||||
EndedAt time.Time `bson:"ended_at" json:"ended_at"`
|
||||
|
|
|
|||
|
|
@ -145,6 +145,7 @@ func main() {
|
|||
api.GET("/token", getOAuthTokenHandler)
|
||||
api.POST("/room", createRoomHandler)
|
||||
api.GET("/room/:id", joinRoomHandler)
|
||||
api.PATCH("/room/:id", updateRoomHandler)
|
||||
api.DELETE("/room/:id", closeRoomHandler)
|
||||
api.PUT("/room/:room/:user", updatePermissionHandler)
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue