encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mastodon comment

Browse Source
This commit is contained in:
lesion
2019-07-03 23:22:17 +02:00
parent 3dff0011ba
commit 03673e016c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/api/controller/bot.js
View File

@@ -17,7 +17,7 @@ const botController = {
access_token, access_token,
api_url: `https://${instance}/api/v1` api_url: `https://${instance}/api/v1`
}) })
const listener = botController.bot.stream('/streaming/public') const listener = botController.bot.stream('/streaming/user')
listener.on('message', botController.message) listener.on('message', botController.message)
listener.on('error', botController.error) listener.on('error', botController.error)
// const botUsers = await User.findAll({ where: { mastodon_auth: { [Op.ne]: null } } }) // const botUsers = await User.findAll({ where: { mastodon_auth: { [Op.ne]: null } } })
@@ -41,14 +41,14 @@ const botController = {
// botController.bots.push({ email: user.email, bot }) // botController.bots.push({ email: user.email, bot })
}, },
async post(instance, access_token, event) { async post(instance, access_token, event) {
const status = `${event.title} @${event.place.name} ${moment(event.start_datetime).format('ddd, D MMMM HH:mm')} - const status = `${event.title} @${event.place.name} ${moment(event.start_datetime*1000).format('ddd, D MMMM HH:mm')} -
${event.description.length > 200 ? event.description.substr(0, 200) + '...' : event.description} - ${event.tags.map(t => '#' + t.tag).join(' ')} ${config.baseurl}/event/${event.id}` ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : event.description} - ${event.tags.map(t => '#' + t.tag).join(' ')} ${config.baseurl}/event/${event.id}`
let media let media
if (event.image_path) { if (event.image_path) {
const file = path.join(config.upload_path, event.image_path) const file = path.join(config.upload_path, event.image_path)
if (fs.statSync(file)) { if (fs.statSync(file)) {
media = await bot.post('media', { file: fs.createReadStream(file) }) media = await botController.bot.post('media', { file: fs.createReadStream(file) })
} }
} }
return botController.bot.post('/statuses', { status, media_ids: media ? [media.data.id] : [] }) return botController.bot.post('/statuses', { status, media_ids: media ? [media.data.id] : [] })
@@ -65,7 +65,8 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
return return
} }
const activitypub_id = String(msg.data.in_reply_to_id) const activitypub_id = String(msg.data.status.in_reply_to_id)
console.error('il toot di reply ', activitypub_id)
if (!activitypub_id) return if (!activitypub_id) return
let event = await Event.findOne({ where: { activitypub_id } }) let event = await Event.findOne({ where: { activitypub_id } })
if (!event) { if (!event) {
@@ -75,8 +76,8 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
event = comment.event event = comment.event
} }
await Comment.create({ await Comment.create({
activitypub_id: msg.data.id, activitypub_id: String(msg.data.status.id),
data: msg.data, data: msg.data.status,
eventId: event.id eventId: event.id
}) })
}, },