Skip to content

Commit 04c6238

Browse files
authored
Merge pull request #34 from infra-workshop/33-future-disable-upload-to-youtube
disable upload to youtube
2 parents 5cacf44 + a024753 commit 04c6238

File tree

4 files changed

+20
-13
lines changed

4 files changed

+20
-13
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"gulp-sourcemaps": "^2.6.5",
3838
"gulp-typescript": "^5.0.1",
3939
"mocha": "^6.2.0",
40-
"typescript": "^3.5.3",
40+
"typescript": "^3.8.3",
4141
"vinyl-source-stream": "latest"
4242
}
4343
}

ts/discord-controller/main.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,14 @@ class CommandError extends Error {
100100
clientSecret: tokens.google.secret,
101101
});
102102

103-
const youtube = new youtube_v3.Youtube({
104-
auth: googleClient
105-
});
103+
let youtube: youtube_v3.Youtube | null;
104+
if (process.env["YOUTUBE_DISABLED"]) {
105+
youtube = null;
106+
} else {
107+
youtube = new youtube_v3.Youtube({
108+
auth: googleClient
109+
});
110+
}
106111
console.log(`google OK`);
107112
await client.login(tokens.discord);
108113
console.log(`login success!`);
@@ -226,7 +231,7 @@ class CommandError extends Error {
226231
const data = await recorderController.stop();
227232
const date = recorderController.startAt;
228233

229-
const uploadPromise: GaxiosPromise<youtube_v3.Schema$Video> = youtube.videos.insert({
234+
const uploadPromise: GaxiosPromise<youtube_v3.Schema$Video>|null = youtube?.videos?.insert({
230235
stabilize: false,
231236
media: {
232237
mimeType: "video/webm",
@@ -249,6 +254,8 @@ class CommandError extends Error {
249254
await message.reply("recorder successfully stopped!");
250255

251256
try {
257+
if (uploadPromise == null)
258+
throw new Error("upload is disabled");
252259
const result = await uploadPromise;
253260

254261
await message.reply(`record is uploaded to https://youtu.be/${result.data.id}`);

ts/markdown/writer/snowflakes.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {CustomWriter} from "./CustomWriter";
22
import {DiscordSnowflakeToken} from "../Tokens";
33
import {escapeHtml} from "../util";
4-
import {GuildChannel, Message} from "discord.js";
4+
import {Message} from "discord.js";
55
import {Env} from "../env";
66

77
function wrapMentionSpan(content: string, colorInt?: number) {
@@ -28,11 +28,11 @@ export const snowflake_user: CustomWriter<DiscordSnowflakeToken> = function snow
2828
const id = token.snowflake;
2929

3030
let userViewName: string;
31-
if (msg.channel.type === 'dm' || msg.channel.type === 'group') {
31+
if (msg.channel.type === 'dm') {
3232
let user = msg.client.users.resolve(id);
3333
userViewName = user != null ? `@${user.username}` : token.content;
3434
} else {
35-
const member = (msg.channel as GuildChannel).guild.members.resolve(id);
35+
const member = msg.channel.guild.members.resolve(id);
3636
if (member) {
3737
if (member.nickname) userViewName = `@${member.nickname}`;
3838
else userViewName = `@${member.user.username}`;
@@ -57,7 +57,7 @@ export const snowflake_role: CustomWriter<DiscordSnowflakeToken> = function snow
5757
const id = token.snowflake;
5858
let userViewName: string;
5959
let color: number | undefined = undefined;
60-
if (msg.channel.type === 'dm' || msg.channel.type === 'group') {
60+
if (msg.channel.type === 'dm') {
6161
userViewName = token.content;
6262
} else {
6363
const role = msg.guild.roles.resolve(id);
@@ -74,7 +74,7 @@ export const snowflake_role: CustomWriter<DiscordSnowflakeToken> = function snow
7474
export const snowflake_emoji: CustomWriter<DiscordSnowflakeToken> = function snowflake_emoji(writer, token, env): void {
7575
const msg = getMsg(env);
7676
const id = token.snowflake;
77-
if (msg.channel.type === 'dm' || msg.channel.type === 'group') token.content;
77+
if (msg.channel.type === 'dm') token.content;
7878
const emoji = msg.guild.emojis.resolve(id);
7979

8080
writer.append(emoji ? `<img alt=":${emoji.name}:" src="${emoji.url}" class="emoji">` : escapeHtml(token.content));

0 commit comments

Comments
 (0)