fix mic status label

bump version
remove docker
2023-04-28 21:16:23 -04:00 · 2023-04-28 14:16:52 -04:00 · 2023-04-28 14:15:43 -04:00 · 2023-04-28 14:15:24 -04:00 · 2023-04-28 13:32:50 -04:00 · 2023-04-28 09:31:40 -04:00
--- a/.devcontainer/Caddyfile
+++ b/.devcontainer/Caddyfile
@ -16,7 +16,7 @@ audon.localhost {
    }
 }

-livekit.audon.localhost {
+livekit.localhost {
    tls /etc/caddy/certs/cert.pem /etc/caddy/certs/key.pem
    encode zstd gzip
    reverse_proxy livekit:7880
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -6,7 +6,7 @@
  // "image": "mcr.microsoft.com/devcontainers/universal:2-linux"
  "dockerComposeFile": "docker-compose.dev.yaml",
  "service": "devcontainer",
-  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+  "workspaceFolder": "/audon-go",

  // Features to add to the dev container. More info: https://containers.dev/features.
  "features": {
@ -33,8 +33,8 @@
        "EditorConfig.EditorConfig"
      ]
    }
-  }
+  },

  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-  // "remoteUser": "root"
+  "remoteUser": "root"
 }
--- a/.devcontainer/docker-compose.dev.yaml
+++ b/.devcontainer/docker-compose.dev.yaml
@ -2,10 +2,12 @@ version: '3.1'

 services:
  devcontainer:
-    image: "mcr.microsoft.com/devcontainers/base:jammy"
+    image: "mcr.microsoft.com/devcontainers/base:debian"
    volumes:
-      - ../..:/workspaces:cached
+      - ..:/audon-go:cached
    command: sleep infinity
+    environment:
+      - "DOCKER_HOST=unix:///run/user/1000/docker.sock"

  db:
    image: mongo:6
--- a/.gitignore
+++ b/.gitignore
@ -66,6 +66,7 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+.pnpm-store/

 # Snowpack dependency directory (https://snowpack.dev/)
 web_modules/
--- a/audon-fe/index.prod.html
+++ b/audon-fe/index.prod.html
@ -29,7 +29,7 @@
    {% end %}
  </head>
  <body>
-    <div id="app" data-version='0.3.1'></div>
+    <div id="app" data-version='0.3.2'></div>
    <script type="module" src="/src/main.js"></script>
  </body>
 </html>
--- a/audon-fe/package.json
+++ b/audon-fe/package.json
@ -1,6 +1,6 @@
 {
  "name": "audon-fe",
-  "version": "0.3.1",
+  "version": "0.3.2",
  "private": true,
  "scripts": {
    "dev": "cp -v index.dev.html index.html && vite",
--- a/audon-fe/pnpm-lock.yaml
+++ b/audon-fe/pnpm-lock.yaml
--- a/audon-fe/src/components/JoinDialog.vue
+++ b/audon-fe/src/components/JoinDialog.vue
@ -28,7 +28,8 @@ export default {
  },
  computed: {
    uploadEnabled() {
-      return this.roomToken?.original && this.roomToken?.indicator;
+      // return this.roomToken?.original && this.roomToken?.indicator;
+      return false;
    },
  },
  async mounted() {
--- a/audon-fe/src/locales/en.yaml
+++ b/audon-fe/src/locales/en.yaml
@ -17,6 +17,21 @@ enterRoom: "Enter"
 leaveRoom: "Leave but keep this room open"
 closeRoom: "Close this room"
 close: "Close"
+emojiReaction: "Open emoji reaction picker"
+micStatus:
+  mute: "Mute microphone"
+  unmute: "Unmute microphone"
+  retry: "Retry enabling microphone"
+  request: "Send speaker request"
+roomOperation:
+  operation: "Leave or close"
+  leave: "Leave this room"
+  close: "Close this room"
+  openRequests: "Open list of speaker requests"
+  edit: "Edit room information"
+requestOperation:
+  decline: "Decline this speaker request"
+  accept: "Accept this speaker request"
 connecting: "Connecting"
 server: "Your Mastodon instance"
 addressRequired: "Enter your instance address"
@ -40,9 +55,9 @@ form:
  advertise: "Allow the bot ({bot}) to advertise your room"
  relationships:
    everyone: "Everyone"
-    following: "Followed accounts only"
-    follower: "Followers-only"
-    knowing: "Followed accounts and/or followers"
+    following: "Followees only (Accounts you're following)"
+    follower: "Followers only (Accounts following you)"
+    knowing: "Followees and/or followers"
    mutual: "Your mutuals"
    private: "CoHosts only"
 shareRoomMessage: "Join my Audon room!\n{link}\n\nTitle: {title}"
--- a/audon-fe/src/locales/ja.yaml
+++ b/audon-fe/src/locales/ja.yaml
@ -17,6 +17,18 @@ enterRoom: "入室"
 leaveRoom: "部屋を閉じずに退室"
 closeRoom: "部屋を閉じる"
 close: "閉じる"
+emojiReaction: "絵文字ピッカーを開く"
+micStatus:
+  mute: "マイクをミュート"
+  unmute: "マイクのミュートを解除"
+  retry: "マイク有効化を再試行"
+  request: "発言リクエストを送る"
+roomOperation:
+  operation: "退室または閉室"
+  leave: "部屋から退室する"
+  close: "部屋を閉室する"
+  openRequests: "発言リクエストの一覧を開く"
+  edit: "部屋の情報を編集する"
 connecting: "接続中"
 server: "Mastodon サーバー"
 addressRequired: "アドレスを入力してください"
--- a/audon-fe/src/stores/mastodon.js
+++ b/audon-fe/src/stores/mastodon.js
@ -47,11 +47,14 @@ export const useMastodonStore = defineStore("mastodon", {
      this.authorized = true;
    },
    async updateAvatar(img, filename) {
+      return;
+      /*
      if (this.client === null) return;
      const avatarBlob = await (await fetch(img)).blob();
      this.userinfo = await this.client.v1.accounts.updateCredentials({
        avatar: new File([avatarBlob], `${Date.now()}_${filename}`),
      });
+      */
    },
    async revertAvatar() {
      const token = await axios.get("/api/token");
--- a/audon-fe/src/views/RoomView.vue
+++ b/audon-fe/src/views/RoomView.vue
@ -257,6 +257,18 @@ export default {
      }
      return mdiMicrophone;
    },
+    micStatusLabel() {
+      if (!(this.iamHost || this.iamCohost || this.iamSpeaker)) {
+        return this.$t("micStatus.request");
+      }
+      if (!this.micGranted) {
+        return this.$t("micStatus.retry");
+      }
+      if (this.iamMuted) {
+        return this.$t("micStatus.unmute");
+      }
+      return this.$t("micStatus.mute");
+    },
    titleErrors() {
      const errors = this.v$.editingRoomInfo.title.$errors;
      const messages = map(errors, (e) => e.$message);
@ -797,6 +809,7 @@ export default {
                :icon="mdiCheck"
                :disabled="isRequestLoading"
                @click.once="onModerate(id, 'speaker')"
+                :aria-label="$t('requestOperation.accept')"
              ></v-btn>
              <v-btn
                size="small"
@ -804,6 +817,7 @@ export default {
                :icon="mdiClose"
                :disabled="isRequestLoading"
                @click="onDeclineRequest(id)"
+                :aria-label="$t('requestOperation.decline')"
              ></v-btn>
            </template>
            <v-list-item-subtitle>
@ -839,6 +853,7 @@ export default {
        @click="showRequestedNotification = false"
        :icon="mdiClose"
        size="small"
+        :aria-label="$t('close')"
      ></v-btn>
    </template>
  </v-snackbar>
@ -863,6 +878,7 @@ export default {
        @click="showRequestNotification = false"
        :icon="mdiClose"
        size="small"
+        :aria-label="$('close')"
      ></v-btn>
    </template>
  </v-snackbar>
@ -879,6 +895,7 @@ export default {
            size="small"
            variant="text"
            color="white"
+            :aria-label="$t('roomOperation.edit')"
            :icon="mdiPencil"
            @click="showEditDialog = true"
          ></v-btn>
@ -955,6 +972,7 @@ export default {
      <v-card-actions v-else class="justify-center" style="gap: 20px">
        <v-btn
          :icon="mdiEmoticon"
+          :aria-label="$t('emojiReaction')"
          color="white"
          variant="flat"
          @click="onPickerPopup"
@ -963,6 +981,7 @@ export default {
        </v-btn>
        <v-btn
          :icon="micStatusIcon"
+          :aria-label="micStatusLabel"
          color="white"
          variant="flat"
          @click="onToggleMute"
@ -972,6 +991,7 @@ export default {
            <v-btn
              :icon="mdiLogout"
              color="red"
+              :aria-label="$t('roomOperation.operation')"
              :disabled="loading"
              variant="flat"
              v-bind="props"
@ -980,6 +1000,7 @@ export default {
          <v-list>
            <v-list-item
              :title="$t('closeRoom')"
+              :aria-label="$t('roomOperation.close')"
              :prepend-icon="mdiCloseBoxOutline"
              @click="onRoomClose"
              class="text-red"
@ -987,6 +1008,7 @@ export default {
            <v-list-item
              :disabled="isLastHost"
              :title="$t('leaveRoom')"
+              :aria-label="$t('roomOperation.leave')"
              :prepend-icon="mdiExitRun"
              @click="onLeave"
            >
@ -998,6 +1020,7 @@ export default {
          :icon="mdiLogout"
          color="red"
          :disabled="loading"
+          :aria-label="$t('roomOperation.leave')"
          @click="onLeave"
          variant="flat"
        ></v-btn>
@ -1009,6 +1032,7 @@ export default {
        >
          <v-btn
            :icon="mdiAccountVoice"
+            :aria-label="$t('roomOperation.openRequests')"
            variant="flat"
            color="white"
            @click="
--- a/server.go
+++ b/server.go
@ -236,8 +236,9 @@ func getAppConfig(server string) (*mastodon.AppConfig, error) {
 	redirectURI = u.String()

 	conf := &mastodon.AppConfig{
-		ClientName:   "Audon",
-		Scopes:       "read:accounts read:follows write:accounts",
+		ClientName: "Audon",
+		// Scopes:       "read:accounts read:follows write:accounts",
+		Scopes:       "read:accounts read:follows",
 		Website:      "https://codeberg.org/nmkj/audon",
 		RedirectURIs: redirectURI,
 	}
Autor	SHA1	Wiadomość	Data
Namekuji	6f7b58f2e2	fix mic status label	2023-04-28 21:16:23 -04:00
Namekuji	03e5cb4f02	bump version	2023-04-28 14:16:52 -04:00
Namekuji	87300ea112	remove docker	2023-04-28 14:15:43 -04:00
Namekuji	7b837651dd	add aria-label to buttons missing content	2023-04-28 14:15:24 -04:00
Namekuji	c40fb71147	use rootless	2023-04-28 13:32:50 -04:00
Namekuji	d52ae18c44	disable avatar update	2023-04-28 09:31:40 -04:00