diff --git a/.gitignore b/.gitignore index 5532e03..5bffdf8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ node_modules/ .env data/*.json +uploads/ *.log verification/ diff --git a/index.js b/index.js index 42242b8..67d5d82 100644 --- a/index.js +++ b/index.js @@ -1,15 +1,9 @@ require('dotenv').config(); const express = require('express'); -const line = require('@line/bot-sdk'); +const { middleware, messagingApi } = require('@line/bot-sdk'); const path = require('path'); -const fs = require('fs'); -const cron = require('node-cron'); -const { DateTime } = require('luxon'); -const axios = require('axios'); const botLogic = require('./src/botLogic'); -const timetableData = require('./src/timetable'); -const googleCalendar = require('./src/googleCalendar'); const config = { channelAccessToken: process.env.CHANNEL_ACCESS_TOKEN, @@ -17,239 +11,17 @@ const config = { }; const app = express(); -const client = new line.Client(config); - -app.use(express.static(path.join(__dirname, 'public'))); -app.use('/images', express.static(path.join(__dirname, 'images'))); - -const SUBSCRIBERS_FILE = path.join(__dirname, 'data/subscribers.json'); -const CHATS_FILE = path.join(__dirname, 'data/chats.json'); - -// API to get events -app.get('/api/events', async (req, res) => { - try { - const year = parseInt(req.query.year) || DateTime.now().setZone('Asia/Tokyo').year; - const month = parseInt(req.query.month) || DateTime.now().setZone('Asia/Tokyo').month; - const calendarIds = (process.env.NEXT_PUBLIC_GOOGLE_CALENDAR_ID || '').split(',').filter(id => id.trim()); - - if (calendarIds.length === 0) { - return res.json({ success: true, data: [] }); - } - - const events = await googleCalendar.getEventsForMonth(calendarIds, year, month); - res.json({ success: true, data: events }); - } catch (err) { - console.error('API Error:', err); - res.status(500).json({ success: false, error: err.message }); - } +const client = new messagingApi.MessagingApiClient({ + channelAccessToken: config.channelAccessToken }); - -// Root route - Modernized Web Dashboard -app.get('/', (req, res) => { - const lastUpdate = DateTime.now().setZone('Asia/Tokyo').toFormat('yyyy/MM/dd HH:mm:ss'); - - const html = ` - - - - - - 時間割LINE Bot ダッシュボード - - - - - -
- -
-

- - 時間割LINE Bot -

-

毎日の授業をもっとスマートに確認

-
- - -
-
-
- -
-
-

Status

-

稼働中

-
-
-
-
- -
-
-

Last Sync

-

${lastUpdate}

-
-
-
-
- -
-
-

Auto Notification

-

毎日 07:00 JST

-
-
-
- - -
-
-

- - 週間時間割 -

-
-
- - - - - - - - - - - - - - ${['月曜日', '火曜日', '水曜日', '木曜日', '金曜日'].map(day => { - const subjects = timetableData[day]; - return ` - - - ${subjects.map(s => ``).join('')} - ${subjects.length < 6 ? Array(6 - subjects.length).fill('').join('') : ''} - `; - }).join('')} - -
曜日1限2限3限4限5限6限
${day}${s}-
-
-
- - -
-
-

- - 行事予定 (${DateTime.now().setZone('Asia/Tokyo').toFormat('LL月')}) -

-
-
-
-
-
-
-
-
- - - - -
-
-

- - 使い方 -

-
    -
  • - Command -
    -

    今日の時間割 / 今日の行事

    -

    直近の授業や行事を即座に確認できます

    -
    -
    • -
  • - Command -
    -

    明日の時間割 / 明日の行事

    -

    翌日の予定を先取りしてチェック

    -
    -
    • -
  • - Command -
    -

    〇曜日の時間割

    -

    特定の曜日の授業をチェック

    -
    -
    • -
  • - Feature -
    -

    モーニング通知

    -

    毎朝7時に自動で通知が届きます

    -
    -
    • -
-
- -
-

今すぐ友だち追加

-

QRコードをスキャンして、
あなたのLINEに時間割を。

-
- LINE QR Code -
-

SHS 2D Class Bot Project

-
-
- - -
- - `; - res.send(html); +const blobClient = new messagingApi.MessagingApiBlobClient({ + channelAccessToken: config.channelAccessToken }); // Webhook -app.post('/webhook', line.middleware(config), async (req, res) => { +app.post('/webhook', middleware(config), async (req, res) => { try { - const results = await Promise.all(req.body.events.map(event => botLogic.handleEvent(event, client))); + const results = await Promise.all(req.body.events.map(event => botLogic.handleEvent(event, client, blobClient))); res.json(results); } catch (err) { console.error('Webhook error:', err); @@ -261,126 +33,9 @@ app.get('/webhook', (req, res) => { res.status(200).send('Webhook is healthy'); }); -// Admin Dashboard -app.get('/admin', (req, res) => { - const password = req.query.pw; - if (password !== process.env.ADMIN_PASSWORD && process.env.ADMIN_PASSWORD) { - return res.status(403).send('

Forbidden

Invalid password.

'); - } - - let subscribersCount = 0; - if (fs.existsSync(SUBSCRIBERS_FILE)) { - subscribersCount = JSON.parse(fs.readFileSync(SUBSCRIBERS_FILE, 'utf8')).length; - } - - let chats = {}; - if (fs.existsSync(CHATS_FILE)) { - chats = JSON.parse(fs.readFileSync(CHATS_FILE, 'utf8')); - } - const chatsCount = Object.keys(chats).length; - - const html = ` - - - - - Admin Dashboard - - - -
-

Admin Dashboard

-
-
-

Subscribers

-

${subscribersCount}

-
-
-

Total Chats (Groups/Users)

-

${chatsCount}

-
-
- -

Broadcast Announcement

-
-
- - -
- -
-
- - `; - res.send(html); -}); - -// Broadcast Logic -app.post('/admin/broadcast', express.urlencoded({ extended: true }), async (req, res) => { - const password = req.query.pw; - if (password !== process.env.ADMIN_PASSWORD && process.env.ADMIN_PASSWORD) { - return res.status(403).send('Forbidden'); - } - - const { message } = req.body; - if (!message) return res.status(400).send('Message is required'); - - if (fs.existsSync(CHATS_FILE)) { - const chats = JSON.parse(fs.readFileSync(CHATS_FILE, 'utf8')); - const chatIds = Object.keys(chats); - - console.log(`Broadcasting message to ${chatIds.length} chats...`); - - // Send messages in background - for (const id of chatIds) { - try { - await client.pushMessage(id, { type: 'text', text: message }); - } catch (err) { - console.error(`Failed to broadcast to ${id}:`, err.message); - } - } - } - - res.send('

Broadcast started

Messages are being sent to all tracked chats.

Back to Dashboard'); -}); - -// Self-pinging to stay awake on Koyeb (every 10 minutes) -const SITE_URL = process.env.SITE_URL; -if (SITE_URL) { - cron.schedule('*/10 * * * *', async () => { - try { - console.log(`Self-pinging: ${SITE_URL}`); - await axios.get(SITE_URL); - } catch (err) { - console.error('Self-ping error:', err.message); - } - }); -} - -// Morning Notification Cron Job (7:00 AM JST) -cron.schedule('0 7 * * *', async () => { - console.log('Running morning notification task...'); - try { - if (fs.existsSync(SUBSCRIBERS_FILE)) { - const subscribers = JSON.parse(fs.readFileSync(SUBSCRIBERS_FILE, 'utf8')); - const timetableFlex = await botLogic.getTodayTimetable(); - - console.log(`Sending morning notification to ${subscribers.length} subscribers`); - - for (const id of subscribers) { - try { - await client.pushMessage(id, timetableFlex); - } catch (pushErr) { - console.error(`Failed to push to ${id}:`, pushErr.message); - } - } - } - } catch (err) { - console.error('Cron job error:', err); - } -}, { - scheduled: true, - timezone: "Asia/Tokyo" +// Basic Root Route +app.get('/', (req, res) => { + res.send('

Yosegaki LINE Bot

The bot is running.

'); }); const port = process.env.PORT || 3000; diff --git a/package.json b/package.json index 2c38f8b..dcfaf2f 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,6 @@ "dependencies": { "@line/bot-sdk": "^9.8.0", "dotenv": "^17.3.1", - "axios": "^1.7.9", - "express": "^5.1.0", - "ical.js": "^2.1.0", - "luxon": "^3.7.2", - "node-cron": "^3.0.3", - "node-schedule": "^2.1.1" + "express": "^5.1.0" } } diff --git a/public/QR.png b/public/QR.png deleted file mode 100644 index 6359ddd..0000000 Binary files a/public/QR.png and /dev/null differ diff --git a/src/botLogic.js b/src/botLogic.js index 137c6e0..17afd89 100644 --- a/src/botLogic.js +++ b/src/botLogic.js @@ -1,199 +1,108 @@ -const { DateTime } = require('luxon'); -const timetableData = require('./timetable'); -const flexTemplates = require('./flexTemplates'); -const googleCalendar = require('./googleCalendar'); const fs = require('fs'); const path = require('path'); +const flexTemplates = require('./flexTemplates'); -const SUBSCRIBERS_FILE = path.join(__dirname, '../data/subscribers.json'); +const UPLOADS_DIR = path.join(__dirname, '../uploads'); const CHATS_FILE = path.join(__dirname, '../data/chats.json'); -const validCommands = [ - '使い方', 'ヘルプ', '今日の時間割', '明日の時間割', - '今日の行事', '明日の行事', - '月曜日の時間割', '火曜日の時間割', '水曜日の時間割', - '木曜日の時間割', '金曜日の時間割', '土曜日の時間割', '日曜日の時間割', - '通知オン', '通知オフ' -]; +// Ensure uploads directory exists +if (!fs.existsSync(UPLOADS_DIR)) { + fs.mkdirSync(UPLOADS_DIR, { recursive: true }); +} /** * Handle incoming LINE events */ -async function handleEvent(event, client) { - // Track chats on follow/join/leave/unfollow events - if (['follow', 'join'].includes(event.type)) { - const chatId = event.source.userId || event.source.groupId || event.source.roomId; - saveChat(chatId, event.source.type); - if (event.type === 'join') { - return client.replyMessage(event.replyToken, { +async function handleEvent(event, client, blobClient) { + const chatId = event.source.userId || event.source.groupId || event.source.roomId; + saveChat(chatId, event.source.type); + + if (event.type === 'follow' || event.type === 'join') { + return client.replyMessage({ + replyToken: event.replyToken, + messages: [{ type: 'text', - text: 'はじめまして！時間割Botです。「使い方」と送ると、できることを確認できます。' - }); - } - return null; + text: 'はじめまして！寄せ書き受付ボットです。寄せ書きのファイル（画像やPDFなど）を送ってください！' + }] + }); } - if (['unfollow', 'leave'].includes(event.type)) { - const chatId = event.source.userId || event.source.groupId || event.source.roomId; + if (event.type === 'unfollow' || event.type === 'leave') { removeChat(chatId); - removeSubscriber(chatId); - return null; - } - - if (event.type !== 'message' || event.message.type !== 'text') { - return null; - } - - const userMessage = event.message.text.trim(); - const source = event.source; - let chatId; - let isGroup = false; - - if (source.type === 'user') { - chatId = source.userId; - } else if (source.type === 'group') { - chatId = source.groupId; - isGroup = true; - } else if (source.type === 'room') { - chatId = source.roomId; - isGroup = true; - } - - // Filter non-commands in groups - if (isGroup && !validCommands.includes(userMessage)) { return null; } - // Ensure chat is tracked - saveChat(chatId, source.type); - - let reply; - - if (userMessage === '使い方' || userMessage === 'ヘルプ') { - reply = flexTemplates.createHelpFlex(); - } else if (userMessage === '今日の時間割') { - reply = await getTodayTimetable(); - } else if (userMessage === '明日の時間割') { - reply = await getTomorrowTimetable(); - } else if (userMessage === '今日の行事') { - reply = await getTodayEvents(); - } else if (userMessage === '明日の行事') { - reply = await getTomorrowEvents(); - } else if (userMessage === '通知オン') { - const added = saveSubscriber(chatId); - return client.replyMessage(event.replyToken, { - type: 'text', - text: added ? '毎朝7時の時間割通知をオンにしました。' : '既に通知はオンになっています。', - quickReply: flexTemplates.getQuickReplies() - }); - } else if (userMessage === '通知オフ') { - const removed = removeSubscriber(chatId); - return client.replyMessage(event.replyToken, { - type: 'text', - text: removed ? '時間割通知をオフにしました。再度オンにするには「通知オン」と送ってください。' : '通知は既にオフになっています。', - quickReply: flexTemplates.getQuickReplies() - }); - } else if (userMessage.endsWith('曜日の時間割')) { - const day = userMessage.replace('の時間割', ''); - reply = await getTimetableForDay(day); - } else { - if (!isGroup) { - return client.replyMessage(event.replyToken, { - type: 'text', - text: '「使い方」と入力すると、使用可能なコマンドが表示されます。', - quickReply: flexTemplates.getQuickReplies() - }); + // Handle message events + if (event.type === 'message') { + const message = event.message; + + // Handle image, video, file, audio + if (['image', 'file', 'video', 'audio'].includes(message.type)) { + try { + const stream = await blobClient.getMessageContent(message.id); + const unsafeFileName = message.fileName || `${Date.now()}_${chatId.substring(0, 8)}.${getFileExtension(message.type)}`; + const fileName = path.basename(unsafeFileName); + const filePath = path.join(UPLOADS_DIR, fileName); + + const writer = fs.createWriteStream(filePath); + + await new Promise((resolve, reject) => { + stream.pipe(writer); + writer.on('finish', resolve); + writer.on('error', reject); + }); + + console.log(`Saved file: ${fileName}`); + return client.replyMessage({ + replyToken: event.replyToken, + messages: [{ + type: 'text', + text: `寄せ書きを受け取りました！ありがとうございます。\n保存名: ${fileName}` + }] + }); + } catch (err) { + console.error('Error saving file:', err); + return client.replyMessage({ + replyToken: event.replyToken, + messages: [{ + type: 'text', + text: 'ファイルの保存中にエラーが発生しました。もう一度試してみてください。' + }] + }); + } } - return null; - } - - // Add quick replies to all replies - reply.quickReply = flexTemplates.getQuickReplies(); - - return client.replyMessage(event.replyToken, reply); -} - -async function getTodayTimetable() { - const now = DateTime.now().setZone('Asia/Tokyo'); - const dayOfWeek = ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'][now.weekday % 7]; - return getTimetableForDay(dayOfWeek, now); -} - -async function getTomorrowTimetable() { - const tomorrow = DateTime.now().setZone('Asia/Tokyo').plus({ days: 1 }); - const dayOfWeek = ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'][tomorrow.weekday % 7]; - return getTimetableForDay(dayOfWeek, tomorrow); -} - -async function getTodayEvents() { - const now = DateTime.now().setZone('Asia/Tokyo'); - const calendarIds = (process.env.NEXT_PUBLIC_GOOGLE_CALENDAR_ID || '').split(',').filter(id => id.trim()); - const events = calendarIds.length > 0 ? await googleCalendar.getEventsForDate(calendarIds, now) : []; - return flexTemplates.createEventsFlex('今日', events); -} -async function getTomorrowEvents() { - const tomorrow = DateTime.now().setZone('Asia/Tokyo').plus({ days: 1 }); - const calendarIds = (process.env.NEXT_PUBLIC_GOOGLE_CALENDAR_ID || '').split(',').filter(id => id.trim()); - const events = calendarIds.length > 0 ? await googleCalendar.getEventsForDate(calendarIds, tomorrow) : []; - return flexTemplates.createEventsFlex('明日', events); -} + // Handle text messages + if (message.type === 'text') { + const userMessage = message.text.trim(); -async function getTimetableForDay(dayOfWeek, date = null) { - const subjects = timetableData[dayOfWeek] || []; - let events = []; + if (userMessage === '使い方' || userMessage === 'ヘルプ') { + return client.replyMessage({ + replyToken: event.replyToken, + messages: [flexTemplates.createHelpFlex()] + }); + } - if (date) { - const calendarIds = (process.env.NEXT_PUBLIC_GOOGLE_CALENDAR_ID || '').split(',').filter(id => id.trim()); - if (calendarIds.length > 0) { - events = await googleCalendar.getEventsForDate(calendarIds, date); + // Default response for text + return client.replyMessage({ + replyToken: event.replyToken, + messages: [{ + type: 'text', + text: '寄せ書きのファイルや画像を送ってください。「使い方」と送るとヘルプを表示します。' + }] + }); } } - return flexTemplates.createTimetableFlex(dayOfWeek, subjects, events); -} - -function saveSubscriber(id) { - if (!id) return false; - try { - if (!fs.existsSync(path.dirname(SUBSCRIBERS_FILE))) { - fs.mkdirSync(path.dirname(SUBSCRIBERS_FILE), { recursive: true }); - } - - let subscribers = []; - if (fs.existsSync(SUBSCRIBERS_FILE)) { - subscribers = JSON.parse(fs.readFileSync(SUBSCRIBERS_FILE, 'utf8')); - } - - if (!subscribers.includes(id)) { - subscribers.push(id); - fs.writeFileSync(SUBSCRIBERS_FILE, JSON.stringify(subscribers, null, 2)); - console.log(`New subscriber added: ${id}`); - return true; - } - return false; - } catch (err) { - console.error('Error saving subscriber:', err); - return false; - } + return null; } -function removeSubscriber(id) { - if (!id) return false; - try { - if (fs.existsSync(SUBSCRIBERS_FILE)) { - let subscribers = JSON.parse(fs.readFileSync(SUBSCRIBERS_FILE, 'utf8')); - if (subscribers.includes(id)) { - subscribers = subscribers.filter(sid => sid !== id); - fs.writeFileSync(SUBSCRIBERS_FILE, JSON.stringify(subscribers, null, 2)); - console.log(`Subscriber removed: ${id}`); - return true; - } - } - return false; - } catch (err) { - console.error('Error removing subscriber:', err); - return false; +function getFileExtension(type) { + switch (type) { + case 'image': return 'jpg'; + case 'video': return 'mp4'; + case 'audio': return 'm4a'; + default: return 'bin'; } } @@ -242,6 +151,5 @@ function removeChat(id) { } module.exports = { - handleEvent, - getTodayTimetable + handleEvent }; diff --git a/src/flexTemplates.js b/src/flexTemplates.js index 96eaf6c..4429265 100644 --- a/src/flexTemplates.js +++ b/src/flexTemplates.js @@ -1,133 +1,11 @@ /** - * Flex Message templates for the LINE Bot + * Flex Message templates for the Yosegaki LINE Bot */ -function createTimetableFlex(day, subjects, events = []) { - const isWeekend = subjects.length === 0; - - const bodyContents = []; - - // Add subjects - if (isWeekend) { - bodyContents.push({ - "type": "text", - "text": `${day}は授業がありません。`, - "size": "md", - "color": "#666666", - "wrap": true - }); - } else { - subjects.forEach((subject, index) => { - bodyContents.push({ - "type": "box", - "layout": "horizontal", - "contents": [ - { - "type": "text", - "text": `${index + 1}限`, - "size": "sm", - "color": "#888888", - "flex": 1 - }, - { - "type": "text", - "text": subject || "-", - "size": "md", - "color": "#333333", - "flex": 4, - "weight": "bold", - "wrap": true - } - ], - "margin": "md", - "paddingBottom": "sm" - }); - }); - } - - // Add events if any - if (events && events.length > 0) { - bodyContents.push({ - "type": "separator", - "margin": "xl" - }); - bodyContents.push({ - "type": "text", - "text": "📅 本日の行事", - "weight": "bold", - "size": "sm", - "margin": "md", - "color": "#4CAF50" - }); - - events.forEach(event => { - bodyContents.push({ - "type": "box", - "layout": "vertical", - "contents": [ - { - "type": "text", - "text": event.summary, - "size": "sm", - "weight": "bold", - "wrap": true - } - ], - "margin": "sm", - "paddingStart": "md" - }); - }); - } - - return { - "type": "flex", - "altText": `【${day}の時間割】`, - "contents": { - "type": "bubble", - "header": { - "type": "box", - "layout": "vertical", - "contents": [ - { - "type": "text", - "text": day, - "weight": "bold", - "size": "xl", - "color": "#ffffff" - } - ], - "backgroundColor": "#4CAF50" - }, - "body": { - "type": "box", - "layout": "vertical", - "contents": bodyContents - }, - "footer": { - "type": "box", - "layout": "vertical", - "spacing": "sm", - "contents": [ - { - "type": "button", - "style": "link", - "height": "sm", - "action": { - "type": "uri", - "label": "詳細をサイトで見る", - "uri": process.env.SITE_URL || "https://shs2d-linebot.aeroindust.com" - } - } - ] - } - } - }; -} - function createHelpFlex() { return { "type": "flex", - "altText": "【時間割ボットの使い方】", + "altText": "【寄せ書きボットの使い方】", "contents": { "type": "bubble", "header": { @@ -142,7 +20,7 @@ function createHelpFlex() { "color": "#ffffff" } ], - "backgroundColor": "#2196F3" + "backgroundColor": "#FF9800" }, "body": { "type": "box", @@ -151,7 +29,7 @@ function createHelpFlex() { "contents": [ { "type": "text", - "text": "以下のコマンドを送信するか、下のボタンをタップしてください。", + "text": "寄せ書きのファイルや画像を受け付けています。", "wrap": true, "size": "sm" }, @@ -160,53 +38,10 @@ function createHelpFlex() { }, { "type": "text", - "text": "• 今日の時間割\n• 今日の行事\n• 明日の時間割 / 行事\n• 〇曜日の時間割\n• 通知オン / 通知オフ", + "text": "• 画像、動画、音声、ファイルを送信してください。\n• 受信したファイルは自動的に保存されます。\n• テキストメッセージは現在受け付けていません。", "wrap": true, - "margin": "md" - } - ] - }, - "footer": { - "type": "box", - "layout": "vertical", - "spacing": "sm", - "contents": [ - { - "type": "button", - "style": "primary", - "color": "#4CAF50", - "action": { - "type": "message", - "label": "今日の時間割", - "text": "今日の時間割" - } - }, - { - "type": "box", - "layout": "horizontal", - "spacing": "sm", - "contents": [ - { - "type": "button", - "style": "secondary", - "action": { - "type": "message", - "label": "通知オン", - "text": "通知オン" - }, - "flex": 1 - }, - { - "type": "button", - "style": "secondary", - "action": { - "type": "message", - "label": "通知オフ", - "text": "通知オフ" - }, - "flex": 1 - } - ] + "margin": "md", + "size": "sm" } ] } @@ -214,140 +49,6 @@ function createHelpFlex() { }; } -function getQuickReplies() { - return { - "items": [ - { - "type": "action", - "action": { - "type": "message", - "label": "今日の予定", - "text": "今日の時間割" - } - }, - { - "type": "action", - "action": { - "type": "message", - "label": "今日の行事", - "text": "今日の行事" - } - }, - { - "type": "action", - "action": { - "type": "message", - "label": "明日", - "text": "明日の時間割" - } - }, - { - "type": "action", - "action": { - "type": "message", - "label": "通知ON", - "text": "通知オン" - } - }, - { - "type": "action", - "action": { - "type": "message", - "label": "通知OFF", - "text": "通知オフ" - } - }, - { - "type": "action", - "action": { - "type": "message", - "label": "ヘルプ", - "text": "ヘルプ" - } - } - ] - }; -} - -function createEventsFlex(day, events = []) { - const bodyContents = []; - - if (events.length === 0) { - bodyContents.push({ - "type": "text", - "text": `${day}に予定されている行事はありません。`, - "size": "md", - "color": "#666666", - "wrap": true - }); - } else { - events.forEach(event => { - bodyContents.push({ - "type": "box", - "layout": "vertical", - "contents": [ - { - "type": "text", - "text": event.summary, - "weight": "bold", - "size": "md", - "wrap": true - } - ], - "margin": "md", - "backgroundColor": "#f0fdf4", - "cornerRadius": "md", - "paddingAll": "md" - }); - if (event.location || event.description) { - const details = []; - if (event.location) details.push(`📍 ${event.location}`); - if (event.description) details.push(event.description); - - bodyContents.push({ - "type": "text", - "text": details.join('\n'), - "size": "xs", - "color": "#888888", - "wrap": true, - "margin": "sm", - "paddingStart": "md" - }); - } - }); - } - - return { - "type": "flex", - "altText": `【${day}の行事予定】`, - "contents": { - "type": "bubble", - "header": { - "type": "box", - "layout": "vertical", - "contents": [ - { - "type": "text", - "text": `${day} の行事`, - "weight": "bold", - "size": "xl", - "color": "#ffffff" - } - ], - "backgroundColor": "#4CAF50" - }, - "body": { - "type": "box", - "layout": "vertical", - "contents": bodyContents - } - } - }; -} - module.exports = { - createTimetableFlex, - createHelpFlex, - getQuickReplies, - createEventsFlex + createHelpFlex }; diff --git a/src/googleCalendar.js b/src/googleCalendar.js deleted file mode 100644 index 3013bf2..0000000 --- a/src/googleCalendar.js +++ /dev/null @@ -1,103 +0,0 @@ -const axios = require('axios'); -const ICAL = require('ical.js'); -const { DateTime } = require('luxon'); - -/** - * Fetches and parses Google Calendar iCal feeds. - * @param {string[]} calendarIds Array of Google Calendar IDs. - * @param {DateTime} targetDate The date to filter events for. - * @returns {Promise} List of events for the target date. - */ -async function getEventsForDate(calendarIds, targetDate) { - const allEvents = []; - - for (const id of calendarIds) { - try { - const url = `https://calendar.google.com/calendar/ical/${encodeURIComponent(id)}/public/basic.ics`; - const response = await axios.get(url); - const jcalData = ICAL.parse(response.data); - const comp = new ICAL.Component(jcalData); - const vevents = comp.getAllSubcomponents('vevent'); - - vevents.forEach(vevent => { - const event = new ICAL.Event(vevent); - const dtstart = event.startDate.toJSDate(); - const dtend = event.endDate.toJSDate(); - - const start = DateTime.fromJSDate(dtstart).setZone('Asia/Tokyo'); - const end = DateTime.fromJSDate(dtend).setZone('Asia/Tokyo'); - - const targetStart = targetDate.startOf('day'); - const targetEnd = targetDate.endOf('day'); - - if (start <= targetEnd && end >= targetStart) { - allEvents.push({ - summary: event.summary, - location: event.location, - description: event.description, - start: start.toISO(), - end: end.toISO(), - isAllDay: event.startDate.isDate - }); - } - }); - } catch (error) { - console.error(`Error fetching calendar ${id}:`, error.message); - } - } - return allEvents; -} - -/** - * Fetches events for a specific month. - * @param {string[]} calendarIds Array of Google Calendar IDs. - * @param {number} year - * @param {number} month 1-12 - * @returns {Promise} List of events for the month. - */ -async function getEventsForMonth(calendarIds, year, month) { - const allEvents = []; - const targetMonthStart = DateTime.fromObject({ year, month, day: 1 }).setZone('Asia/Tokyo').startOf('month'); - const targetMonthEnd = targetMonthStart.endOf('month'); - - for (const id of calendarIds) { - try { - const url = `https://calendar.google.com/calendar/ical/${encodeURIComponent(id)}/public/basic.ics`; - const response = await axios.get(url); - const jcalData = ICAL.parse(response.data); - const comp = new ICAL.Component(jcalData); - const vevents = comp.getAllSubcomponents('vevent'); - - vevents.forEach(vevent => { - const event = new ICAL.Event(vevent); - const dtstart = event.startDate.toJSDate(); - const dtend = event.endDate.toJSDate(); - - const start = DateTime.fromJSDate(dtstart).setZone('Asia/Tokyo'); - const end = DateTime.fromJSDate(dtend).setZone('Asia/Tokyo'); - - // If event overlaps with target month - if (start <= targetMonthEnd && end >= targetMonthStart) { - allEvents.push({ - summary: event.summary, - location: event.location, - description: event.description, - start: start.toISO(), - end: end.toISO(), - isAllDay: event.startDate.isDate, - calendarId: id - }); - } - }); - } catch (error) { - console.error(`Error fetching calendar ${id}:`, error.message); - } - } - // Sort events by start date - return allEvents.sort((a, b) => DateTime.fromISO(a.start).toMillis() - DateTime.fromISO(b.start).toMillis()); -} - -module.exports = { - getEventsForDate, - getEventsForMonth -}; diff --git a/src/test-logic.js b/src/test-logic.js deleted file mode 100644 index 4e43eec..0000000 --- a/src/test-logic.js +++ /dev/null @@ -1,79 +0,0 @@ -const botLogic = require('./botLogic'); -const { DateTime } = require('luxon'); - -// Mock client -const client = { - replyMessage: (token, message) => { - console.log(`[MOCK] Replying with:`, JSON.stringify(message, null, 2)); - return Promise.resolve(message); - } -}; - -async function runTests() { - console.log('--- Testing Bot Logic ---'); - - // Test 1: Notification On - console.log('\nTest 1: Notification On'); - await botLogic.handleEvent({ - type: 'message', - message: { type: 'text', text: '通知オン' }, - source: { type: 'user', userId: 'U999' }, - replyToken: 'T1' - }, client); - - // Test 2: Notification Off - console.log('\nTest 2: Notification Off'); - await botLogic.handleEvent({ - type: 'message', - message: { type: 'text', text: '通知オフ' }, - source: { type: 'user', userId: 'U999' }, - replyToken: 'T2' - }, client); - - // Test 3: Today's Events - console.log('\nTest 3: Today\'s Events'); - await botLogic.handleEvent({ - type: 'message', - message: { type: 'text', text: '今日の行事' }, - source: { type: 'user', userId: 'U999' }, - replyToken: 'T3' - }, client); - - // Test 4: Tracking on Join - console.log('\nTest 4: Tracking on Join'); - await botLogic.handleEvent({ - type: 'join', - source: { type: 'group', groupId: 'G123' }, - replyToken: 'T4' - }, client); - - // Test 5: Verification - console.log('\nTest 5: Final Verification'); - const fs = require('fs'); - const path = require('path'); - const subsFile = path.join(__dirname, '../data/subscribers.json'); - if (fs.existsSync(subsFile)) { - const subs = JSON.parse(fs.readFileSync(subsFile, 'utf8')); - console.log('Subscribers in file:', subs); - if (!subs.includes('U999')) { - console.log('SUCCESS: User U999 was removed.'); - } else { - console.log('FAILURE: User U999 was NOT removed.'); - } - } - - const chatsFile = path.join(__dirname, '../data/chats.json'); - if (fs.existsSync(chatsFile)) { - const chats = JSON.parse(fs.readFileSync(chatsFile, 'utf8')); - console.log('Chats in file:', Object.keys(chats)); - if (chats['G123']) { - console.log('SUCCESS: Group G123 was tracked.'); - } else { - console.log('FAILURE: Group G123 was NOT tracked.'); - } - } - - console.log('\n--- Tests Completed ---'); -} - -runTests().catch(console.error); diff --git a/src/test-yosegaki.js b/src/test-yosegaki.js new file mode 100644 index 0000000..ab0f297 --- /dev/null +++ b/src/test-yosegaki.js @@ -0,0 +1,83 @@ +const botLogic = require('./botLogic'); +const fs = require('fs'); +const path = require('path'); +const stream = require('stream'); + +// Mock clients +const client = { + replyMessage: (params) => { + console.log(`[MOCK] Replying with:`, JSON.stringify(params, null, 2)); + return Promise.resolve(params); + } +}; + +const blobClient = { + getMessageContent: (id) => { + console.log(`[MOCK] Getting content for message: ${id}`); + const s = new stream.Readable(); + s.push('mock content'); + s.push(null); + return Promise.resolve(s); + } +}; + +async function runTests() { + console.log('--- Testing Yosegaki Bot Logic (v9 SDK) ---'); + + // Test 1: Follow event + console.log('\nTest 1: Follow event'); + await botLogic.handleEvent({ + type: 'follow', + source: { type: 'user', userId: 'U111' }, + replyToken: 'T1' + }, client, blobClient); + + // Test 2: Image message + console.log('\nTest 2: Image message'); + await botLogic.handleEvent({ + type: 'message', + message: { type: 'image', id: 'img123' }, + source: { type: 'user', userId: 'U111' }, + replyToken: 'T2' + }, client, blobClient); + + // Test 3: File message with potential path traversal + console.log('\nTest 3: File message (Path Traversal attempt)'); + await botLogic.handleEvent({ + type: 'message', + message: { type: 'file', id: 'file456', fileName: '../../attack.txt' }, + source: { type: 'user', userId: 'U111' }, + replyToken: 'T3' + }, client, blobClient); + + // Test 4: Help command + console.log('\nTest 4: Help command'); + await botLogic.handleEvent({ + type: 'message', + message: { type: 'text', text: '使い方' }, + source: { type: 'user', userId: 'U111' }, + replyToken: 'T4' + }, client, blobClient); + + // Verification + console.log('\n--- Final Verification ---'); + const uploadsDir = path.join(__dirname, '../uploads'); + const files = fs.readdirSync(uploadsDir); + console.log('Files in uploads directory:', files); + + const hasAttackTxt = files.includes('attack.txt'); // It should be basename-d + const rootFiles = fs.readdirSync(path.join(__dirname, '../')); + const traversalSucceeded = rootFiles.includes('attack.txt'); + + if (hasAttackTxt && !traversalSucceeded) { + console.log('SUCCESS: Path traversal prevented and file saved as basename.'); + } else if (traversalSucceeded) { + console.log('FAILURE: Path traversal succeeded!'); + } else { + console.log('FAILURE: attack.txt not found.'); + } + + console.log('\n--- Tests Completed ---'); +} + +runTests().catch(console.error); diff --git a/src/timetable.js b/src/timetable.js deleted file mode 100644 index aaf038b..0000000 --- a/src/timetable.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - "月曜日": ["地理総合", "ハードウェア技術", "プログラミング技術", "コンピュータシステム", "体育", "Ⅰ類：数学・Ⅱ類：物理"], - "火曜日": ["プログラミング技術", "Ⅰ類：電気回路・Ⅱ類：物理", "Ⅰ類：英語・Ⅱ類：国語", "Ⅰ類：物理・Ⅱ類：数学", "コンピュータシステム", "Ⅰ類：国語・Ⅱ類：英語"], - "水曜日": ["Ⅰ類：数学・Ⅱ類：物理", "ハードウェア技術", "Ⅰ類：国語・Ⅱ類：英語", "Ⅰ類：物理・Ⅱ類：数学", "Ⅰ類：英語・Ⅱ類：国語", "体育"], - "木曜日": ["実習", "実習", "実習", "実習", "ハードウェア技術", "LHR"], - "金曜日": ["Ⅰ類：国語・Ⅱ類：英語", "Ⅰ類：英語・Ⅱ類：国語", "Ⅰ類：電気回路・Ⅱ類：数学", "地理総合", "Ⅰ類：数学・Ⅱ類：物理", "保健"], - "土曜日": [], - "日曜日": [] -};