Merge pull request #34 from infra-workshop/33-future-disable-upload-t…

…o-youtube

disable upload to youtube

package.json

@@ -37,7 +37,7 @@
     "gulp-sourcemaps": "^2.6.5",
     "gulp-typescript": "^5.0.1",
     "mocha": "^6.2.0",
-    "typescript": "^3.5.3",
+    "typescript": "^3.8.3",
     "vinyl-source-stream": "latest"
   }
 }

ts/discord-controller/main.ts

@@ -100,9 +100,14 @@ class CommandError extends Error {
         clientSecret: tokens.google.secret,
     });
 
-    const youtube = new youtube_v3.Youtube({
-        auth: googleClient
-    });
+    let youtube: youtube_v3.Youtube | null;
+    if (process.env["YOUTUBE_DISABLED"]) {
+        youtube = null;
+    } else {
+        youtube = new youtube_v3.Youtube({
+            auth: googleClient
+        });
+    }
     console.log(`google OK`);
     await client.login(tokens.discord);
     console.log(`login success!`);
@@ -226,7 +231,7 @@ class CommandError extends Error {
                     const data = await recorderController.stop();
                     const date = recorderController.startAt;
 
-                    const uploadPromise: GaxiosPromise<youtube_v3.Schema$Video> = youtube.videos.insert({
+                    const uploadPromise: GaxiosPromise<youtube_v3.Schema$Video>|null = youtube?.videos?.insert({
                         stabilize: false,
                         media: {
                             mimeType: "video/webm",
@@ -249,6 +254,8 @@ class CommandError extends Error {
                     await message.reply("recorder successfully stopped!");
 
                     try {
+                        if (uploadPromise == null)
+                            throw new Error("upload is disabled");
                         const result = await uploadPromise;
 
                         await message.reply(`record is uploaded to https://youtu.be/${result.data.id}`);

ts/markdown/writer/snowflakes.ts

@@ -1,7 +1,7 @@
 import {CustomWriter} from "./CustomWriter";
 import {DiscordSnowflakeToken} from "../Tokens";
 import {escapeHtml} from "../util";
-import {GuildChannel, Message} from "discord.js";
+import {Message} from "discord.js";
 import {Env} from "../env";
 
 function wrapMentionSpan(content: string, colorInt?: number) {
@@ -28,11 +28,11 @@ export const snowflake_user: CustomWriter<DiscordSnowflakeToken> = function snow
     const id = token.snowflake;
 
     let userViewName: string;
-    if (msg.channel.type === 'dm' || msg.channel.type === 'group') {
+    if (msg.channel.type === 'dm') {
         let user = msg.client.users.resolve(id);
         userViewName = user != null ? `@${user.username}` : token.content;
     } else {
-        const member = (msg.channel as GuildChannel).guild.members.resolve(id);
+        const member = msg.channel.guild.members.resolve(id);
         if (member) {
             if (member.nickname) userViewName = `@${member.nickname}`;
             else userViewName = `@${member.user.username}`;
@@ -57,7 +57,7 @@ export const snowflake_role: CustomWriter<DiscordSnowflakeToken> = function snow
     const id = token.snowflake;
     let userViewName: string;
     let color: number | undefined = undefined;
-    if (msg.channel.type === 'dm' || msg.channel.type === 'group') {
+    if (msg.channel.type === 'dm') {
         userViewName = token.content;
     } else {
         const role = msg.guild.roles.resolve(id);
@@ -74,7 +74,7 @@ export const snowflake_role: CustomWriter<DiscordSnowflakeToken> = function snow
 export const snowflake_emoji: CustomWriter<DiscordSnowflakeToken> = function snowflake_emoji(writer, token, env): void {
     const msg = getMsg(env);
     const id = token.snowflake;
-    if (msg.channel.type === 'dm' || msg.channel.type === 'group') token.content;
+    if (msg.channel.type === 'dm') token.content;
     const emoji = msg.guild.emojis.resolve(id);
 
     writer.append(emoji ? `<img alt=":${emoji.name}:" src="${emoji.url}" class="emoji">` : escapeHtml(token.content));