Skip to content

Commit

Permalink
Revert "[update] オリジナルキャラクターに対応"
Browse files Browse the repository at this point in the history
This reverts commit 4a08437.
  • Loading branch information
settyan117 committed Aug 22, 2023
1 parent 4a08437 commit 774cb79
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions character-quiz/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ const loadCharacters = async (author: string) => {
.split('\n')
.slice(1)
.filter((line) => line.length > 0);
const lines2 = ['1639631274615922693,1639631180734828551,https://pbs.twimg.com/media/FsEj3ypakAcC-C5.jpg,宝鐘 マリン,ほうしょう まりん,ホロライブ,0',
'1639940025914888193,1639939822130462721,https://pbs.twimg.com/media/FsI8lFcagAEw1wR.jpg,,,オリジナル,0']
return lines2
return lines
.map((line) => {
const [
tweetId,
Expand All @@ -80,8 +78,8 @@ const loadCharacters = async (author: string) => {
rating,
] = line.split(',');

const characterNames = characterName.split(/[、&]/).filter((name) => name !== '');
const characterRubys = characterRuby.split(/[、&]/).filter((name) => name !== '');
const characterNames = characterName.split(/[、&]/);
const characterRubys = characterRuby.split(/[、&]/);

const names = [...characterNames, ...characterRubys];
const namePartsList = names.map((name) => name.split(' '));
Expand All @@ -94,20 +92,18 @@ const loadCharacters = async (author: string) => {
tweetId,
mediaId,
imageUrl,
characterName: characterNames[0]?.replace(/ /g, '') ?? '',
characterName: characterNames[0].replace(/ /g, ''),
workName: normalizedWorkName,
validAnswers: [
...namePartsList.map((parts) => parts.join('')),
...namePartsList.flat(),
],
author,
rating: rating ?? '0',
characterId: `${namePartsList[0]?.join('') ?? ''}\0${normalizedWorkName}`,
characterId: `${namePartsList[0].join('')}\0${normalizedWorkName}`,
} as CharacterData;
})
.filter(({characterName, validAnswers, rating}) => {
return characterName !== '' && validAnswers.length > 0 && rating === '0';
});
.filter(({rating}) => rating === '0');
};

const loaderNamori = new Loader<CharacterData[]>(() => loadCharacters('namori'));
Expand Down Expand Up @@ -352,19 +348,18 @@ export default async (slackClients: SlackInterface) => {
mutex.runExclusive(async () => {
if (
message.text &&
message.text.match(/^(?:キャラ|なもり|Ixy)当てクイズs$/)
message.text.match(/^(?:キャラ|なもり|Ixy)当てクイズ$/)
) {
const characters = await (async () => {
const namori =
message.text === 'キャラ当てクイズ' ||
message.text === 'なもり当てクイズ' ? await loaderNamori.load() : [];
const ixy =
message.text === 'キャラ当てクイズ' ||
message.text === 'Ixy当てクイズs' ? await loaderIxy.load() : [];
message.text === 'Ixy当てクイズ' ? await loaderIxy.load() : [];

return [...namori, ...ixy];
})();
console.log(characters)
const candidateCharacterIds = characters
.filter(
(character) => !persistentState.recentCharacterIds.includes(
Expand All @@ -382,8 +377,6 @@ export default async (slackClients: SlackInterface) => {
),
);

console.log(candidateCharacterIds)

const problem = await generateProblem(answer);
const quiz = new CharacterQuiz(slackClients, problem, postOption);

Expand Down

0 comments on commit 774cb79

Please sign in to comment.