ORGANISATION-KA-INTERNATIONALE/api.pawol.nu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ORGANISATION-KA-INTERNATIONALE/api.pawol.nu:9ef6935446c82a8a137cc1f2e33175864670f415
Branches Tags
ORGANISATION-KA-INTERNATIONALE/api.pawol.nu:master
...
compare: ORGANISATION-KA-INTERNATIONALE/api.pawol.nu:39aa3a31eb09ba16bf2d3f76593f5f914a9c3f40
Branches Tags
ORGANISATION-KA-INTERNATIONALE/api.pawol.nu:master

14 Commits
9ef6935446 ... 39aa3a31eb

Author SHA1 Message Date
cedric 39aa3a31eb replace oki.re by pwaol.nu 2026-05-12 16:43:23 +04:00
cedric 883480c012 build: upgrade to v5.44.0 2026-04-29 17:55:39 +04:00
Cédric Famibelle-Pronzola fe44c32eb0 Merge pull request 'Correction des effets de bords liés à la migration vers la v5' (#3) from upgrade-fix into master 
Reviewed-on: https://codeberg.org/OKI/api.oki.re/pulls/3
 2026-04-28 11:32:04 +02:00
cedric 3ab054bee3 remove logs 2026-04-28 12:36:51 +04:00
cedric f781d52d1f fix: adapt parole beforeCreate method 2026-04-28 12:31:19 +04:00
cedric be4c7ed421 fix: change DeepL API calls config 2026-04-28 12:30:46 +04:00
cedric 7a168f54ff fix: use documentId 2026-04-28 12:30:29 +04:00
cedric 7df8ec1df2 config: change middleware file 2026-04-28 12:25:09 +04:00
cedric b219ca277d build: upgrade to v5.43.0 2026-04-28 12:24:51 +04:00
Cédric Famibelle-Pronzola 9a6ce8166a Merge pull request 'Upgrade vers la v5.42.1 de Strapi' (#2) from v5-upgrade into master 
Reviewed-on: https://codeberg.org/OKI/api.oki.re/pulls/2
 2026-04-22 05:31:17 +02:00
cedric b532981404 Changes from codemod 2026-04-21 21:35:59 +04:00
cedric e7bc8790b1 Fix stats request 2026-04-21 19:46:58 +04:00
cedric b71f1535bb build: upgrade to Strapi v5.42.1 2026-04-21 18:58:19 +04:00
cedric e32c08ac74 build: remove cache plugins 2026-04-17 10:34:24 +04:00
14 changed files with 5556 additions and 4741 deletions
Expand all files Collapse all files
.strapi/client/app.js
-4
View File
@@ -2,9 +2,7 @@
* This file was automatically generated by Strapi. * This file was automatically generated by Strapi.
* Any modifications made will be discarded. * Any modifications made will be discarded.
*/ */
import i18N from "@strapi/plugin-i18n/strapi-admin";
import usersPermissions from "@strapi/plugin-users-permissions/strapi-admin"; import usersPermissions from "@strapi/plugin-users-permissions/strapi-admin";
import restCache from "strapi-plugin-rest-cache/strapi-admin";
import { renderAdmin } from "@strapi/strapi/admin"; import { renderAdmin } from "@strapi/strapi/admin";
import customisations from "../../src/admin/app.js"; import customisations from "../../src/admin/app.js";
@@ -13,8 +11,6 @@ renderAdmin(document.getElementById("strapi"), {
customisations, customisations,
plugins: { plugins: {
i18n: i18N,
"users-permissions": usersPermissions, "users-permissions": usersPermissions,
"rest-cache": restCache,
}, },
}); });
.strapi/client/index.html
+2 -1
View File
@@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<!-- <!--
This file was automatically generated by Strapi. This file was automatically generated by Strapi.
@@ -58,5 +58,6 @@ Any modifications made will be discarded.
</div> </div>
</div></noscript </div></noscript
> >
<script type="module" src="/.strapi/client/app.js"></script>
</body> </body>
</html> </html>
config/middleware.js → config/middlewares.js
View File
package.json
+6 -9
View File
@@ -1,5 +1,5 @@
{ {
"name": "api.oki.re", "name": "api.pawol.nu",
"description": "API de l'application web est conçue pour faciliter la transcription et la traduction automatiques de contenus musicaux.", "description": "API de l'application web est conçue pour faciliter la transcription et la traduction automatiques de contenus musicaux.",
"private": false, "private": false,
"version": "0.1.0", "version": "0.1.0",
@@ -11,7 +11,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://codeberg.org/OKI/api.oki.re.git" "url": "git+https://codeberg.org/OKI/api.pawol.nu.git"
}, },
"scripts": { "scripts": {
"dev": "strapi develop", "dev": "strapi develop",
@@ -21,19 +21,16 @@
}, },
"devDependencies": {}, "devDependencies": {},
"dependencies": { "dependencies": {
"@strapi/plugin-i18n": "4.26.1", "@strapi/plugin-users-permissions": "5.44.0",
"@strapi/plugin-users-permissions": "4.26.1",
"@strapi/provider-email-nodemailer": "^4.26.1", "@strapi/provider-email-nodemailer": "^4.26.1",
"@strapi/strapi": "4.26.1", "@strapi/strapi": "5.44.0",
"better-sqlite3": "^12.9.0", "better-sqlite3": "^12.9.0",
"diff": "^5.1.0", "diff": "^5.1.0",
"react": "^18.0.0", "react": "^18.0.0",
"react-dom": "^18.0.0", "react-dom": "^18.0.0",
"react-router-dom": "^5.2.0", "react-router-dom": "^6.0.0",
"slugify": "^1.6.5", "slugify": "^1.6.5",
"strapi-plugin-rest-cache": "^4.2.4", "styled-components": "^6.0.0",
"strapi-provider-rest-cache-memory": "^4.2.4",
"styled-components": "^5.2.1",
"yup": "^1.7.1" "yup": "^1.7.1"
}, },
"strapi": { "strapi": {
src/api/artiste/content-types/artiste/lifecycles.js
-5
View File
@@ -1,10 +1,5 @@
'use strict'; 'use strict';
/**
* Read the documentation (https://strapi.io/documentation/v3.x/concepts/models.html#lifecycle-hooks)
* to customize this model
*/
const { ApplicationError } = require("@strapi/utils").errors const { ApplicationError } = require("@strapi/utils").errors
const slugify = require('slugify') const slugify = require('slugify')
src/api/artiste/controllers/artiste.js
+4 -2
View File
@@ -26,7 +26,9 @@ module.exports = createCoreController('api::artiste.artiste', ({strapi}) => ({
} }
} }
const user = await strapi.entityService.findOne('plugin::users-permissions.user', body.data.user.id) const user = await strapi.documents('plugin::users-permissions.user').findOne({
documentId: body.data.user.documentId
})
if (!user) { if (!user) {
throw new NotFoundError('Utilisateur introuvable.') throw new NotFoundError('Utilisateur introuvable.')
@@ -43,7 +45,7 @@ module.exports = createCoreController('api::artiste.artiste', ({strapi}) => ({
if (artiste) { if (artiste) {
return artiste return artiste
} else { } else {
const newArtiste = await strapi.entityService.create('api::artiste.artiste', { const newArtiste = await strapi.documents('api::artiste.artiste').create({
data: { data: {
...data ...data
} }
src/api/commentaire/controllers/commentaire.js
+9 -4
View File
@@ -21,7 +21,9 @@ module.exports = createCoreController('api::commentaire.commentaire', ({strapi})
throw new UnauthorizedError(ctx, err, 'Opération non autorisée') throw new UnauthorizedError(ctx, err, 'Opération non autorisée')
} }
} }
const user = await strapi.entityService.findOne('plugin::users-permissions.user', body.data.user.id) const user = await strapi.documents('plugin::users-permissions.user').findOne({
documentId: data.user.documentId
})
if (!user) { if (!user) {
throw new NotFoundError('Utilisateur introuvable.') throw new NotFoundError('Utilisateur introuvable.')
@@ -33,7 +35,8 @@ module.exports = createCoreController('api::commentaire.commentaire', ({strapi})
data.user = user.id data.user = user.id
const parole = await strapi.entityService.findOne('api::parole.parole', data.parole, { const parole = await strapi.documents('api::parole.parole').findOne({
documentId: user.documentId,
fields: ['id'] fields: ['id']
}) })
@@ -41,13 +44,15 @@ module.exports = createCoreController('api::commentaire.commentaire', ({strapi})
throw new NotFoundError('Texte introuvable.') throw new NotFoundError('Texte introuvable.')
} }
const newCommentaire = await strapi.entityService.create('api::commentaire.commentaire', { const newCommentaire = await strapi.documents('api::commentaire.commentaire').create({
data: { data: {
...data ...data
} }
}) })
await strapi.entityService.update('api::parole.parole', parole.id, { await strapi.documents('api::parole.parole').update({
documentId: user.documentId,
data: { data: {
commentaires: [newCommentaire.id] commentaires: [newCommentaire.id]
} }
src/api/parole/content-types/parole/lifecycles.js
+29 -35
View File
@@ -31,7 +31,7 @@ const isSlugExists = async existingSlug => {
} }
const jwennAwtisEpiId = async artistesIds => { const jwennAwtisEpiId = async artistesIds => {
if (artistesIds.length === 0) { if (!artistesIds || artistesIds.length === 0) {
throw new ApplicationError('Champ obligatoire. Veuillez choisir au moins un artiste.'); throw new ApplicationError('Champ obligatoire. Veuillez choisir au moins un artiste.');
} }
@@ -53,8 +53,8 @@ const jwennUserEpiId = async userId => {
} }
const user = await strapi.db.query('plugin::users-permissions.user').findOne({ const user = await strapi.db.query('plugin::users-permissions.user').findOne({
where: {id: userId} where: {user: userId}
}) })
if (!user) { if (!user) {
throw new ApplicationError('Utilisateur introuvable.') throw new ApplicationError('Utilisateur introuvable.')
@@ -116,43 +116,36 @@ const jwennSuperAdminEpiId = async userAdminId => {
module.exports = { module.exports = {
beforeCreate: async event => { beforeCreate: async event => {
let {data} = event.params let {data} = event.params
delete data.createdBy
delete data.updatedBy
strapi.service('api::parole.parole').validateParoles(data.titre, data.transcription) strapi.service('api::parole.parole').validateParoles(data.titre, data.transcription)
const userAdmin = await jwennUserAdminEpiId(data?.createdBy)
if (userAdmin) {
data.userAdmin = userAdmin
}
let artistesIds = [] let artistesIds = []
if (data?.artistes?.connect) { if (data?.artistes?.connect?.length) {
for (const artiste of data.artistes.connect) { artistesIds = data.artistes.connect.map(a => a.id)
artistesIds.push(artiste.id)
if (data.titre && !data.forceSlug) {
const artiste = await jwennAwtisEpiId(artistesIds)
data.slug = getSlug(artiste, data.titre)
} }
} else {
artistesIds = data.artistes
}
if (data.titre && !data.forceSlug) { const getSlugExistance = await isSlugExists(data.slug)
const artiste = await jwennAwtisEpiId(artistesIds)
data.slug = getSlug(artiste, data.titre)
}
const getSlugExistance = await isSlugExists(data.slug) if (getSlugExistance) {
throw new ApplicationError('Un morceau du même artiste existe déjà.')
if (getSlugExistance) { }
throw new ApplicationError('Un morceau du même artiste existe déjà.')
} }
}, },
beforeUpdate: async event => { beforeUpdate: async event => {
const {state} = event const {state} = event
let {data} = event.params let {data} = event.params
const {where} = event.params const {documentId} = data
const {id} = where
const previousParoles = await strapi.db.query('api::parole.parole').findOne({ const previousParoles = await strapi.db.query('api::parole.parole').findOne({
where: {id}, where: {documentId},
populate: {difference: true, artistes: true} populate: {difference: true, artistes: true}
}) })
@@ -162,25 +155,26 @@ module.exports = {
state.diff = difference state.diff = difference
} }
if(!data.publishedAt && data.titre && data.transcription) { if(!data.publishedAt && data.titre && data.transcription) {
strapi.service('api::parole.parole').validateParoles(data.titre, data.transcription) strapi.service('api::parole.parole').validateParoles(data.titre, data.transcription)
if (data.titre && !data.forceSlug) { if (data.titre && !data.forceSlug) {
let artistes let artistes
if (data.artistes.connect.length === 0) { if (data.artistes.connect.length === 0) {
artistes = previousParoles.artistes.map(a => a.alias).join('-') artistes = previousParoles.artistes.map(a => a.alias).join('-')
} else { } else {
artistes = await jwennAwtisEpiId(data.artistes.connect) let artistesIds = []
artistesIds = data.artistes.connect.map(a => a.id)
artistes = await jwennAwtisEpiId(artistesIds)
} }
data.slug = getSlug(artistes, data.titre) data.slug = getSlug(artistes, data.titre)
} }
} }
if (data.publishedAt != null) { if (data.publishedAt != null) {
const {id} = where
const previousData = await strapi.db.query('api::parole.parole').findOne({ const previousData = await strapi.db.query('api::parole.parole').findOne({
where: {id}, where: {documentId}
populate: {userAdmin: true, user: true}
}) })
const previousPublishedAt = previousData.publishedAt const previousPublishedAt = previousData.publishedAt
@@ -192,7 +186,7 @@ module.exports = {
strapi.plugins['email'].services.email.send({ strapi.plugins['email'].services.email.send({
from: process.env.SMTP_FROM, from: process.env.SMTP_FROM,
to: previousData.user.email, to: previousData.user.email,
subject: `Publication de "${previousData.titre}" sur oki.re`, subject: `Publication de "${previousData.titre}" sur pawol.nu`,
text: `Le titre que vous avez soumis, "${previousData.titre}" a été publié sur le site. text: `Le titre que vous avez soumis, "${previousData.titre}" a été publié sur le site.
Vous pouvez le trouver à l'adresse ${process.env.WEBSITE_URL}/paroles/${previousData.slug} Vous pouvez le trouver à l'adresse ${process.env.WEBSITE_URL}/paroles/${previousData.slug}
Merci pour votre contribution ❤️`, Merci pour votre contribution ❤️`,
@@ -205,7 +199,7 @@ module.exports = {
strapi.plugins['email'].services.email.send({ strapi.plugins['email'].services.email.send({
from: process.env.SMTP_FROM, from: process.env.SMTP_FROM,
to: previousData.userAdmin.email, to: previousData.userAdmin.email,
subject: `Publication de "${previousData.titre}" sur oki.re`, subject: `Publication de "${previousData.titre}" sur pawol.nu`,
text: `Le titre que vous avez soumis, "${previousData.titre}" a été publié sur le site. text: `Le titre que vous avez soumis, "${previousData.titre}" a été publié sur le site.
Vous pouvez le trouver à l'adresse ${process.env.WEBSITE_URL}/paroles/${previousData.slug}. Vous pouvez le trouver à l'adresse ${process.env.WEBSITE_URL}/paroles/${previousData.slug}.
Merci pour votre contribution ❤️`, Merci pour votre contribution ❤️`,
@@ -239,7 +233,7 @@ module.exports = {
} }
}, },
afterUpdate: async event => { afterUpdate: async event => {
const {result, state} = event const {result, state} = event
if (state.diff) { if (state.diff) {
await strapi.entityService.update('api::parole.parole', result.id, { await strapi.entityService.update('api::parole.parole', result.id, {
src/api/parole/controllers/parole.js
+18 -9
View File
@@ -3,18 +3,21 @@
const { createCoreController } = require('@strapi/strapi').factories; const { createCoreController } = require('@strapi/strapi').factories;
module.exports = createCoreController('api::parole.parole', ({strapi}) => ({ module.exports = createCoreController('api::parole.parole', ({strapi}) => ({
async findOne(ctx) { async findOne(documentId) {
const {id} = ctx.params const parole = await strapi.documents('api::parole.parole').findOne({
const parole = await strapi.entityService.findOne('api::parole.parole', id, { documentId,
populate: ['artistes'] populate: ['artistes']
}) })
return parole return parole
}, },
async update(ctx) { async update(ctx) {
const {body} = ctx.request const {body} = ctx.request
const {data} = body const {data} = body
const updatedParole = await strapi.entityService.update('api::parole.parole', data.id, { const updatedParole = await strapi.documents('api::parole.parole').update({
documentId: data.documentId,
data: { data: {
...data ...data
} }
@@ -41,7 +44,9 @@ module.exports = createCoreController('api::parole.parole', ({strapi}) => ({
} }
} }
const user = await strapi.entityService.findOne('plugin::users-permissions.user', body.data.user.id) const user = await strapi.documents('plugin::users-permissions.user').findOne({
documentId: body.data.user.documentId
})
if (!user) { if (!user) {
ctx.notFound('Utilisateur introuvable.') ctx.notFound('Utilisateur introuvable.')
@@ -51,13 +56,15 @@ module.exports = createCoreController('api::parole.parole', ({strapi}) => ({
ctx.badRequest('Informations non valides.') ctx.badRequest('Informations non valides.')
} }
const artiste = await strapi.entityService.findOne('api::artiste.artiste', data.artistes[0]) const artiste = await strapi.documents('api::artiste.artiste').findOne({
documentId: data.artistes[0].documentId
})
if (!artiste) { if (!artiste) {
ctx.notFound('Artiste introuvable.') ctx.notFound('Artiste introuvable.')
} }
const currentUserParole = await strapi.entityService.findMany('api::parole.parole', { const currentUserParole = await strapi.documents('api::parole.parole').findMany({
fields: ['id'], fields: ['id'],
filters: { filters: {
user: { user: {
@@ -77,7 +84,7 @@ module.exports = createCoreController('api::parole.parole', ({strapi}) => ({
data.traductions = translated data.traductions = translated
} }
const newParole = await strapi.entityService.create('api::parole.parole', { const newParole = await strapi.documents('api::parole.parole').create({
data: { data: {
...data ...data
} }
@@ -86,7 +93,9 @@ module.exports = createCoreController('api::parole.parole', ({strapi}) => ({
const parolesIds = currentUserParole.map(({id}) => id) const parolesIds = currentUserParole.map(({id}) => id)
parolesIds.push(newParole.id) parolesIds.push(newParole.id)
await strapi.entityService.update('plugin::users-permissions.user', user.id, { await strapi.documents('plugin::users-permissions.user').update({
documentId: user.documentId,
data: { data: {
paroles: parolesIds paroles: parolesIds
} }
src/api/parole/services/parole.js
+8 -3
View File
@@ -21,15 +21,20 @@ class Translator {
target_lang: target, target_lang: target,
text text
} }
const result = await axios.post(this.urlRequest, qs.stringify(data), { const result = await axios.post(this.urlRequest, {
text: Array.isArray(text) ? text : [text],
source_lang: origin,
target_lang: target,
}, {
headers: { headers: {
'content-type': 'application/x-www-form-urlencoded' Authorization: `DeepL-Auth-Key ${this.deeplKey}`,
'Content-Type': 'application/json'
} }
}) })
return result.data return result.data
} catch (error) { } catch (error) {
console.log('error', error) console.error('DeepL error:', error?.response?.data || error);
} }
} }
} }
src/api/stats/controllers/stats.js
+6 -7
View File
@@ -2,13 +2,12 @@
module.exports = { module.exports = {
async count(ctx, next) { async count(ctx, next) {
const countArtiste = await strapi.entityService.count('api::artiste.artiste') const countArtiste = await strapi.documents('api::artiste.artiste').count({
const countParole = await strapi.entityService.count('api::parole.parole', { publicationState: 'live'
filters: { })
publishedAt: {
$notNull: true, const countParole = await strapi.documents('api::parole.parole').count({
} publicationState: 'live'
}
}) })
return {countArtiste, countParole} return {countArtiste, countParole}
types/generated/components.d.ts
Vendored
+24 -28
View File
@@ -1,6 +1,6 @@
import type { Attribute, Schema } from '@strapi/strapi'; import type { Schema, Struct } from '@strapi/strapi';
export interface DifferenceParolesDiff extends Schema.Component { export interface DifferenceParolesDiff extends Struct.ComponentSchema {
collectionName: 'components_diff_paroles_diffs'; collectionName: 'components_diff_paroles_diffs';
info: { info: {
description: ''; description: '';
@@ -8,28 +8,24 @@ export interface DifferenceParolesDiff extends Schema.Component {
icon: 'american-sign-language-interpreting'; icon: 'american-sign-language-interpreting';
}; };
attributes: { attributes: {
admin_user: Attribute.Relation< admin_user: Schema.Attribute.Relation<'oneToOne', 'admin::user'>;
'difference.paroles-diff', date: Schema.Attribute.DateTime;
'oneToOne', jsonDiff: Schema.Attribute.JSON;
'admin::user' paroles: Schema.Attribute.RichText;
>; sources: Schema.Attribute.Enumeration<
date: Attribute.DateTime;
jsonDiff: Attribute.JSON;
paroles: Attribute.RichText;
sources: Attribute.Enumeration<
[ [
'transcription', 'transcription',
'francais', 'francais',
'anglais', 'anglais',
'espagnol', 'espagnol',
'allemand', 'allemand',
'italien' 'italien',
] ]
>; >;
}; };
} }
export interface StoreAlbum extends Schema.Component { export interface StoreAlbum extends Struct.ComponentSchema {
collectionName: 'components_store_albums'; collectionName: 'components_store_albums';
info: { info: {
description: ''; description: '';
@@ -37,7 +33,7 @@ export interface StoreAlbum extends Schema.Component {
icon: 'music'; icon: 'music';
}; };
attributes: { attributes: {
plateforme: Attribute.Enumeration< plateforme: Schema.Attribute.Enumeration<
[ [
'Tidal', 'Tidal',
'Spotify', 'Spotify',
@@ -46,14 +42,14 @@ export interface StoreAlbum extends Schema.Component {
'Youtubemusic', 'Youtubemusic',
'Applemusic', 'Applemusic',
'Amazon', 'Amazon',
'Soundcloud' 'Soundcloud',
] ]
>; >;
url: Attribute.String; url: Schema.Attribute.String;
}; };
} }
export interface TradTraductions extends Schema.Component { export interface TradTraductions extends Struct.ComponentSchema {
collectionName: 'components_trad_traductions'; collectionName: 'components_trad_traductions';
info: { info: {
description: ''; description: '';
@@ -61,15 +57,15 @@ export interface TradTraductions extends Schema.Component {
icon: 'spell-check'; icon: 'spell-check';
}; };
attributes: { attributes: {
allemand: Attribute.RichText; allemand: Schema.Attribute.RichText;
anglais: Attribute.RichText; anglais: Schema.Attribute.RichText;
espagnol: Attribute.RichText; espagnol: Schema.Attribute.RichText;
francais: Attribute.RichText; francais: Schema.Attribute.RichText;
italien: Attribute.RichText; italien: Schema.Attribute.RichText;
}; };
} }
export interface UrlLiens extends Schema.Component { export interface UrlLiens extends Struct.ComponentSchema {
collectionName: 'components_url_liens'; collectionName: 'components_url_liens';
info: { info: {
description: ''; description: '';
@@ -77,16 +73,16 @@ export interface UrlLiens extends Schema.Component {
icon: 'hand-pointer'; icon: 'hand-pointer';
}; };
attributes: { attributes: {
plateforme: Attribute.Enumeration< plateforme: Schema.Attribute.Enumeration<
['Youtube', 'Gad\u00E9', 'Dailymotion', 'Vimeo', 'File', 'Lbry', 'Rumble'] ['Youtube', 'Gad\u00E9', 'Dailymotion', 'Vimeo', 'File', 'Lbry', 'Rumble']
>; >;
url: Attribute.String; url: Schema.Attribute.String;
}; };
} }
declare module '@strapi/types' { declare module '@strapi/strapi' {
export module Shared { export module Public {
export interface Components { export interface ComponentSchemas {
'difference.paroles-diff': DifferenceParolesDiff; 'difference.paroles-diff': DifferenceParolesDiff;
'store.album': StoreAlbum; 'store.album': StoreAlbum;
'trad.traductions': TradTraductions; 'trad.traductions': TradTraductions;
types/generated/contentTypes.d.ts
Vendored
+634 -520
View File
File diff suppressed because it is too large Load Diff
yarn.lock
+4816 -4114
View File
File diff suppressed because it is too large Load Diff