NoLog.cz/gancio-upstream
6
0
Fork 0
mirror of https://framagit.org/les/gancio.git synced 2025-02-01 00:52:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: remote events removal

Browse source
This commit is contained in:
lesion 2024-01-21 23:13:41 +01:00
parent a7f7fe3ecf
commit 742ed44534
No known key found for this signature in database
GPG key ID: 352918250B012177
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/api/controller/event.js
View file

@ -11,7 +11,7 @@ const Col = helpers.col
const notifier = require('../../notifier') const notifier = require('../../notifier')
const { htmlToText } = require('html-to-text') const { htmlToText } = require('html-to-text')
const { Event, Resource, Tag, Place, Notification, APUser, Collection } = require('../models/models') const { Event, Resource, Tag, Place, Notification, APUser, Collection, EventNotification } = require('../models/models')
const exportController = require('./export') const exportController = require('./export')
@ -586,6 +586,7 @@ const eventController = {
try { try {
// remove related resources // remove related resources
await Resource.destroy({ where: { eventId: event.id }}) await Resource.destroy({ where: { eventId: event.id }})
await EventNotification.destroy({ where: { eventId: event.id }})
// and finally remove the event // and finally remove the event
await event.destroy() await event.destroy()

6
server/helpers/ap.js
View file

@ -1,4 +1,4 @@
const { Event, Resource } = require('../api/models/models') const { Event, Resource, EventNotification } = require('../api/models/models')
const { Op } = require('sequelize') const { Op } = require('sequelize')
const { DateTime } = require('luxon') const { DateTime } = require('luxon')
const log = require('../log') const log = require('../log')
@ -9,13 +9,15 @@ module.exports = {
const events = await Event.findAll({ where: { const events = await Event.findAll({ where: {
start_datetime: { [Op.lt]: now }, start_datetime: { [Op.lt]: now },
apUserApId: { [Op.ne]: null } apUserApId: { [Op.ne]: null }
}}) }, raw: true })
if (!events.length) { return } if (!events.length) { return }
log.info(`Remove ${events.length} past federated events and related resources`) log.info(`Remove ${events.length} past federated events and related resources`)
await Resource.destroy({ where: { eventId: events.map(e => e.id) }}) await Resource.destroy({ where: { eventId: events.map(e => e.id) }})
await EventNotification.destroy({ where: { eventId: events.map(e => e.id) }})
await Event.destroy({ await Event.destroy({
where: { where: {
start_datetime: { [Op.lt]: now }, start_datetime: { [Op.lt]: now },