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

Squashed commit of the following:

Browse Source 
commit 5c0d380740c24e0467cef916fd0560cb26409f9f
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:22:25 2023 +0100

    update yarn.lock

commit 909ee71ecb8f27e4fba72430aecc92bf527e6cd4
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:22:09 2023 +0100

    Squashed commit of the following:

    commit fc8a9f4506
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 16:42:24 2023 +0100

        address some issues with recurrent events, fix #247

    commit f7357666ca
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 16:16:52 2023 +0100

        fix event import from URL

    commit e1bca6f46a
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 16:15:42 2023 +0100

         add Duch (nl) locale (thanks @jeoenepraat)

    commit 5f8afdbc12
    Merge: 57a052a 92ca5ab
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 11:39:50 2023 +0100

        Merge remote-tracking branch 'weblate/master'

    commit 57a052a7fa
    Merge: 63d1d2e 55137d2
    Author: lesion <lesion@autistici.org>
    Date:   Tue Mar 14 11:39:33 2023 +0100

        Merge commit '55137d2ac23549e633f36ad10139fd4168c2645f'

    commit 92ca5abf5e
    Author: joenepraat <joenepraat@posteo.org>
    Date:   Fri Mar 10 23:16:32 2023 +0000

        Translated using Weblate (Dutch)

        Currently translated at 68.3% (214 of 313 strings)

        Translation: Gancio/Web
        Translate-URL: https://hosted.weblate.org/projects/gancio/web/nl/

    commit 63d1d2ee53
    Author: lesion <lesion@autistici.org>
    Date:   Thu Mar 9 21:41:06 2023 +0100

        minor

    commit d2759a55a5
    Author: lesion <lesion@autistici.org>
    Date:   Thu Mar 9 21:38:39 2023 +0100

        wrong user / admin merge dark theme settings - fix #244

    commit b401d829db
    Author: lesion <lesion@autistici.org>
    Date:   Thu Mar 9 21:24:45 2023 +0100

        remove a small warning

    commit ccffe5f7b0
    Author: lesion <lesion@autistici.org>
    Date:   Fri Feb 24 11:40:36 2023 +0100

        push tags on release

    commit 55137d2ac2
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Thu Feb 23 23:56:16 2023 +0000

        Bump sequelize from 6.28.0 to 6.29.0

        Bumps [sequelize](https://github.com/sequelize/sequelize) from 6.28.0 to 6.29.0.
        - [Release notes](https://github.com/sequelize/sequelize/releases)
        - [Commits](https://github.com/sequelize/sequelize/compare/v6.28.0...v6.29.0)

        ---
        updated-dependencies:
        - dependency-name: sequelize
          dependency-type: direct:production
        ...

        Signed-off-by: dependabot[bot] <support@github.com>

    commit b654f29d8b
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 13:21:17 2023 +0100

        update changelog

    commit 0cd1ee9d89
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 13:17:29 2023 +0100

        increase rate limit max requests per minutes

    commit b6dafc082e
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 08:45:39 2023 +0100

        minor

    commit 0fa7769844
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 08:45:18 2023 +0100

        location saving is not working when geocoding is disabled, fix #238

    commit 07f9e2d9ee
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 08:33:40 2023 +0100

        really fix #232

    commit bae930799e
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 08:33:09 2023 +0100

        downgrade mariadb (sequelize is not ready)

    commit d733d7fef1
    Author: lesion <lesion@autistici.org>
    Date:   Wed Feb 22 00:16:28 2023 +0100

        aargh

    commit 98b22aad70
    Author: lesion <lesion@autistici.org>
    Date:   Tue Feb 21 00:56:06 2023 +0100

        minor

    commit fc098b603d
    Author: lesion <lesion@autistici.org>
    Date:   Tue Feb 21 00:55:44 2023 +0100

        missing i18n in setup, fix #239

    commit 3eaf72af19
    Merge: bba196b d6c6034
    Author: lesion <lesion@autistici.org>
    Date:   Mon Feb 20 21:17:37 2023 +0100

        Merge remote-tracking branch 'weblate/master'

    commit bba196b068
    Author: lesion <lesion@autistici.org>
    Date:   Sat Feb 18 00:05:52 2023 +0100

        update changelog, v1.6.3

    commit bb9f7cca47
    Author: lesion <lesion@autistici.org>
    Date:   Sat Feb 18 00:04:28 2023 +0100

        minor

    commit 80d2dbd06b
    Author: lesion <lesion@autistici.org>
    Date:   Fri Feb 17 23:40:28 2023 +0100

        minor

    commit d6c6034630
    Author: fadelkon <fadelkon@posteo.net>
    Date:   Thu Feb 16 22:09:23 2023 +0000

        Translated using Weblate (Catalan)

        Currently translated at 100.0% (313 of 313 strings)

        Translation: Gancio/Web
        Translate-URL: https://hosted.weblate.org/projects/gancio/web/ca/

    commit d125cf1506
    Author: lesion <lesion@autistici.org>
    Date:   Fri Feb 17 21:56:31 2023 +0100

        set a default user_locale path

    commit 4367960a62
    Merge: c8cc5c6 87dd179
    Author: lesion <lesion@autistici.org>
    Date:   Tue Feb 7 17:46:58 2023 +0100

        Merge branch 'master' into gh

    commit c8cc5c6c97
    Merge: 88e0c90 550e221
    Author: lesion <lesion@autistici.org>
    Date:   Mon Jan 9 17:15:21 2023 +0100

        Merge branch 'master' into gh

    commit 88e0c90a66
    Merge: 421aa12 f212ac1
    Author: lesion <lesion@autistici.org>
    Date:   Thu Dec 15 09:54:41 2022 +0100

        Merge branch 'master' into gh

    commit 421aa12781
    Merge: 5f6cc46 b3488e7
    Author: lesion <lesion@autistici.org>
    Date:   Wed Sep 28 12:26:08 2022 +0200

        Merge branch 'master' into gh

    commit 5f6cc46cdc
    Merge: b66feb9 171d968
    Author: lesion <lesion@autistici.org>
    Date:   Mon Aug 8 00:08:12 2022 +0200

        Merge branch 'master' into gh

    commit b66feb92e2
    Merge: 80c55d5 05d068f
    Author: lesion <lesion@autistici.org>
    Date:   Tue Jun 21 23:48:40 2022 +0200

        Merge branch 'master' into gh

    commit 80c55d5601
    Merge: 814090e a154fdf
    Author: lesion <lesion@autistici.org>
    Date:   Mon Jun 6 17:27:00 2022 +0200

        Merge branch 'master' into gh

    commit 814090e9b6
    Merge: 616c542 2e3aba9
    Author: lesion <lesion@autistici.org>
    Date:   Mon Jun 6 17:19:31 2022 +0200

        Merge branch 'master' into gh

    commit 616c54229a
    Merge: e4cb22e 82dcaf9
    Author: lesion <lesion@autistici.org>
    Date:   Mon Jun 6 16:57:05 2022 +0200

        Merge branch 'master' into gh

    commit e4cb22ee33
    Merge: 5dddfbd 8657937
    Author: lesion <lesion@autistici.org>
    Date:   Fri Mar 11 23:41:22 2022 +0100

        Merge branch 'master' into gh

    commit 5dddfbd29e
    Merge: 60e9d95 10c6b0d
    Author: lesion <lesion@autistici.org>
    Date:   Fri Mar 11 23:22:12 2022 +0100

        Merge branch 'master' into gh

    commit 60e9d95ba8
    Merge: 79445ca ad93f83
    Author: lesion <lesion@autistici.org>
    Date:   Tue Dec 7 01:35:18 2021 +0100

        Merge branch 'master' into gh

    commit 79445ca8a7
    Merge: 9472d8d cd313ef
    Author: les <lesion@autistici.org>
    Date:   Thu Jun 24 21:52:25 2021 +0200

        Merge branch 'master' into gh

    commit 9472d8d919
    Merge: f960149 9e9643e
    Author: les <lesion@autistici.org>
    Date:   Fri Mar 26 22:27:41 2021 +0100

        Merge branch 'dev' into gh

    commit f9601492dc
    Author: les <lesion@autistici.org>
    Date:   Fri Dec 6 11:30:41 2019 +0100

        update dependencies

    commit f8c7fa2b45
    Author: les <lesion@autistici.org>
    Date:   Fri Dec 6 11:41:13 2019 +0100

        minor

    commit 33ca266535
    Author: les <lesion@autistici.org>
    Date:   Fri Dec 6 11:38:15 2019 +0100

        prepare gh as a mirror

commit 5c8875411631048210eb50030e83cb272a40d54a
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:18:40 2023 +0100

    update deps

commit 7eac4fce324a6e75cdda296d672317cf2497c005
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:18:25 2023 +0100

    refactoring event detail page

commit dc9ca88bc62708b869be3f3efe51d9155fe17830
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:17:35 2023 +0100

    show hide boosts/bookmarks, fix #241

commit d4a25b1dd0b9404e0de7ca5cf546f0d29bc8943e
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:13:58 2023 +0100

    minor with unixFormat

commit 239d6bcab19ef3cf53d1b2544a5c9a36ba8dd25b
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:12:25 2023 +0100

    minor

commit b149f980db8245c12a6940997be6d5657bddf829
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:12:05 2023 +0100

    minor

commit 6f2955c584ec9da2c10991fb09ab57735a31385d
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:11:49 2023 +0100

    minor

commit dd586c38c9ef2f0b408ef90eb27dffe53355305a
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:11:31 2023 +0100

    minor on style

commit 544823717b9801e63bef15394b25bfbcd842c10f
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:11:15 2023 +0100

    fix multidate issue, go to event on save

commit 9ef0c75d03ee2d69f89034b28d6991f85ffefb06
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 23:09:47 2023 +0100

    use v-lazy, improve search, full tag/place events

commit ac91072b79960815e0535e63ac45e0b5c6100764
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 22:47:51 2023 +0100

    increase DDOS limiter to 250 req/min

commit d0ca92efb4afe48d2fd236083d9e290ab8d49704
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 22:47:14 2023 +0100

    update changelog

commit 2d54f19225acc4118d60ef8c9d12f9495e6776ca
Author: lesion <lesion@autistici.org>
Date:   Sun Mar 19 22:46:51 2023 +0100

    use luxon instead of dayjs, new $time plugin
This commit is contained in:
lesion
2023-03-19 23:26:57 +01:00
parent fc8a9f4506
commit 99d78e2492
35 changed files with 1907 additions and 1899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
server/api/controller/event.js
View File

@@ -1,7 +1,7 @@
const crypto = require('crypto')
const path = require('path')
const config = require('../../config')
const fs = require('fs')
const fs = require('fs/promises')
const { Op } = require('sequelize')
const linkifyHtml = require('linkify-html')
const Sequelize = require('sequelize')
@@ -85,73 +85,6 @@ const eventController = {
return res.json(ret)
},
// async search(req, res) {
// const search = req.query.search.trim().toLocaleLowerCase()
// const show_recurrent = req.query.show_recurrent || false
// const end = req.query.end
// const replacements = []
// const where = {
// // do not include parent recurrent event
// recurrent: null,
// // confirmed event only
// is_visible: true,
// }
// if (!show_recurrent) {
// where.parentId = null
// }
// if (end) {
// where.start_datetime = { [Op.lte]: end }
// }
// if (search) {
// replacements.push(search)
// where[Op.or] =
// [
// { title: Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('title')), 'LIKE', '%' + search + '%') },
// Sequelize.where(Sequelize.fn('LOWER', Sequelize.col('name')), 'LIKE', '%' + search + '%'),
// Sequelize.fn('EXISTS', Sequelize.literal(`SELECT 1 FROM event_tags WHERE ${Col('event_tags.eventId')}=${Col('event.id')} AND LOWER(${Col('tagTag')}) = ?`))
// ]
// }
// const events = await Event.findAll({
// where,
// attributes: {
// exclude: ['likes', 'boost', 'userId', 'is_visible', 'createdAt', 'updatedAt', 'description', 'resources']
// },
// order: [['start_datetime', 'DESC']],
// include: [
// {
// model: Tag,
// // order: [Sequelize.literal('(SELECT COUNT("tagTag") FROM event_tags WHERE tagTag = tag) DESC')],
// attributes: ['tag'],
// through: { attributes: [] }
// },
// { model: Place, required: true, attributes: ['id', 'name', 'address', 'latitude', 'longitude'] }
// ],
// replacements,
// limit: 30,
// }).catch(e => {
// log.error('[EVENT]', e)
// return res.json([])
// })
// const ret = events.map(e => {
// e = e.get()
// e.tags = e.tags ? e.tags.map(t => t && t.tag) : []
// return e
// })
// return res.json(ret)
// },
async _get(slug) {
// retrocompatibility, old events URL does not use slug, use id as fallback
const id = Number(slug) || -1
@@ -494,8 +427,8 @@ const eventController = {
try {
const old_path = path.resolve(config.upload_path, event.media[0].url)
const old_thumb_path = path.resolve(config.upload_path, 'thumb', event.media[0].url)
fs.unlinkSync(old_path)
fs.unlinkSync(old_thumb_path)
await fs.unlink(old_path)
await fs.unlink(old_thumb_path)
} catch (e) {
log.info(e.toString())
}
@@ -573,8 +506,8 @@ const eventController = {
try {
const old_path = path.join(config.upload_path, event.media[0].url)
const old_thumb_path = path.join(config.upload_path, 'thumb', event.media[0].url)
fs.unlinkSync(old_thumb_path)
fs.unlinkSync(old_path)
await fs.unlink(old_thumb_path)
await fs.unlink(old_path)
} catch (e) {
log.info(e.toString())
}
@@ -746,7 +679,7 @@ const eventController = {
const start_date = dayjs.unix(e.start_datetime)
let cursor = start_date > startAt ? start_date : startAt
startAt = cursor
const duration = dayjs.unix(e.end_datetime).diff(start_date, 's')
const duration = e.end_datetime ? e.end_datetime-e.start_datetime : 0
const frequency = recurrent.frequency
const type = recurrent.type
@@ -782,9 +715,14 @@ const eventController = {
}
log.debug(cursor)
event.start_datetime = cursor.unix()
event.end_datetime = event.start_datetime + duration
const newEvent = await Event.create(event)
return newEvent.addTags(e.tags)
event.end_datetime = e.end_datetime ? event.start_datetime + duration : null
try {
const newEvent = await Event.create(event)
return newEvent.addTags(e.tags)
} catch (e) {
console.error(event)
log.error('[RECURRENT EVENT]', e)
}
},
/**

3
server/api/controller/locale.js
View File

@@ -18,7 +18,8 @@ const localeController = {
// check if we have a user custom messages
let customLocaleMessages = {}
const customLocalePath = path.resolve(config.user_locale, `${locale}.json`)
const customLocalePath = config.user_locale && path.resolve(config.user_locale, `${locale}.json`)
if (config.user_locale && fs.existsSync(customLocalePath)) {
try {
customLocaleMessages = require(customLocalePath)

2
server/api/controller/place.js
View File

@@ -18,7 +18,7 @@ module.exports = {
const format = req.params.format || 'json'
log.debug(`Events for place: ${placeName}`)
const events = await eventController._select({ places: String(place.id), show_recurrent: true })
const events = await eventController._select({ places: String(place.id), show_recurrent: true, older: true })
switch (format) {
case 'rss':

2
server/api/controller/tag.js
View File

@@ -33,7 +33,7 @@ module.exports = {
const eventController = require('./event')
const format = req.params.format || 'json'
const tags = req.params.tag
const events = await eventController._select({ tags: tags.toLocaleLowerCase(), show_recurrent: true })
const events = await eventController._select({ tags: tags.toLocaleLowerCase(), show_recurrent: true, older: true })
switch (format) {
case 'rss':
return exportController.feed(req, res, events,

4
server/api/limiter.js
View File

@@ -7,11 +7,11 @@ const instanceApiRateLimiter = {
DDOSProtectionApiRateLimiter: (process.env.NODE_ENV === 'test' ? next : rateLimit({
windowMs: 60 * 1000, // 1 minutes
max: 150, // Limit each IP to 150 requests per `window`
max: 250, // Limit each IP to 150 requests per `window`
standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
legacyHeaders: false, // Disable the `X-RateLimit-*` headers
handler: (request, response, next, options) => {
log.warn(`DDOS protection api rate limiter: > 150req/minute/ip ${request.ip}`)
log.warn(`DDOS protection api rate limiter: > 250req/minute/ip ${request.ip}`)
return response.status(options.statusCode).send(options.message)
}
})),