Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config.development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ services:
recaptcha_sitekey: 6Lc2BtYUAAAAAOUBI-9r1sDJUIfG2nt6C43noOXh
db:
connection_uri: MONGODB_URI
type: mongodb
atlas: true
options:
useUnifiedTopology: true
Expand Down
1 change: 1 addition & 0 deletions config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ services:
recaptcha_sitekey: 6Lc2BtYUAAAAAOUBI-9r1sDJUIfG2nt6C43noOXh
db:
connection_uri: mongodb://localhost/Aletheia
type: mongodb
options:
useUnifiedTopology: true
useNewUrlParser: true
Expand Down
1 change: 1 addition & 0 deletions config.production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
db:
atlas: true
connection_uri: MONGODB_URI
type: mongodb
options:
useUnifiedTopology: true
useNewUrlParser: true
Expand Down
1 change: 1 addition & 0 deletions config.seed.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ services:
smtp_email_user: {env(SMTP_EMAIL_USER)}
db:
connection_uri: MONGODB_URI
type: mongodb
options:
useUnifiedTopology: true
useNewUrlParser: true
Expand Down
1 change: 1 addition & 0 deletions config.seed.test.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ services:
disable_smtp: true
db:
connection_uri: {env(CI_MONGODB_URI)}
type: mongodb
options:
useUnifiedTopology: true
useNewUrlParser: true
Expand Down
1 change: 1 addition & 0 deletions config.test.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ services:
recaptcha_sitekey: {env(TEST_RECAPTCHA_SITEKEY)}
db:
connection_uri: {env(CI_MONGODB_URI)}
type: mongodb
options:
useUnifiedTopology: true
useNewUrlParser: true
Expand Down
8 changes: 4 additions & 4 deletions next-i18next.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const path = require('path');
const path = require("path");

module.exports = {
i18n: {
defaultLocale: 'en',
locales: ['en', 'pt'],
defaultLocale: "en",
locales: ["en", "pt"],
},
localePath: './dist/public/locales',
localePath: "./dist/public/locales",
};
160 changes: 90 additions & 70 deletions scripts/copyStaticAssets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,95 +10,115 @@
* - Starts the process of copying directories and then initiates the merge and overwrite procedures.
*/

import * as fs from 'fs';
import * as path from 'path';
import * as _ from 'lodash';
import * as shell from 'shelljs';
import * as fs from "fs";
import * as path from "path";
import * as _ from "lodash";
import * as shell from "shelljs";

function loadJson(filePath: string): any {
if (fs.existsSync(filePath)) {
return JSON.parse(fs.readFileSync(filePath, 'utf8'));
}
return null;
if (fs.existsSync(filePath)) {
return JSON.parse(fs.readFileSync(filePath, "utf8"));
}
return null;
}

function saveJson(filePath: string, data: any): void {
const dir = path.dirname(filePath);
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir, { recursive: true });
}
fs.writeFileSync(filePath, JSON.stringify(data, null, 2), 'utf8');
const dir = path.dirname(filePath);
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir, { recursive: true });
}
fs.writeFileSync(filePath, JSON.stringify(data, null, 2), "utf8");
}

function mergeJsonFiles(defaultFilePath: string, overrideFilePath: string, distFilePath: string): void {
const defaultJson = loadJson(defaultFilePath);
const overrideJson = loadJson(overrideFilePath);
function mergeJsonFiles(
defaultFilePath: string,
overrideFilePath: string,
distFilePath: string
): void {
const defaultJson = loadJson(defaultFilePath);
const overrideJson = loadJson(overrideFilePath);

if (defaultJson) {
let mergedJson;
if (overrideJson) {
mergedJson = _.merge({}, defaultJson, overrideJson);
} else {
mergedJson = defaultJson;
if (defaultJson) {
let mergedJson;
if (overrideJson) {
mergedJson = _.merge({}, defaultJson, overrideJson);
} else {
mergedJson = defaultJson;
}
saveJson(distFilePath, mergedJson);
console.log(`Arquivo JSON salvo: ${distFilePath}`);
}
saveJson(distFilePath, mergedJson);
console.log(`Arquivo JSON salvo: ${distFilePath}`);
}
}

function replaceFile(defaultFilePath: string, overrideFilePath: string, distFilePath: string): void {
const dir = path.dirname(distFilePath);
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir, { recursive: true });
console.log(`Diretório criado: ${dir}`);
}
function replaceFile(
defaultFilePath: string,
overrideFilePath: string,
distFilePath: string
): void {
const dir = path.dirname(distFilePath);
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir, { recursive: true });
console.log(`Diretório criado: ${dir}`);
}

if (fs.existsSync(overrideFilePath)) {
fs.copyFileSync(overrideFilePath, distFilePath);
console.log(`Arquivo sobrescrito: ${distFilePath}`);
} else {
fs.copyFileSync(defaultFilePath, distFilePath);
console.log(`Arquivo copiado: ${distFilePath}`);
}
if (fs.existsSync(overrideFilePath)) {
fs.copyFileSync(overrideFilePath, distFilePath);
console.log(`Arquivo sobrescrito: ${distFilePath}`);
} else {
fs.copyFileSync(defaultFilePath, distFilePath);
console.log(`Arquivo copiado: ${distFilePath}`);
}
}

function processDirectory(defaultDir: string, overrideDir: string, distDir: string): void {
if (!fs.existsSync(defaultDir)) {
console.error(`Diretório padrão não encontrado: ${defaultDir}`);
return;
}
if (!fs.existsSync(overrideDir)) {
console.warn(`Diretório de sobrescrição não encontrado: ${overrideDir}`);
}
function processDirectory(
defaultDir: string,
overrideDir: string,
distDir: string
): void {
if (!fs.existsSync(defaultDir)) {
console.error(`Diretório padrão não encontrado: ${defaultDir}`);
return;
}
if (!fs.existsSync(overrideDir)) {
console.warn(
`Diretório de sobrescrição não encontrado: ${overrideDir}`
);
}

fs.readdirSync(defaultDir).forEach(file => {
const defaultFilePath = path.join(defaultDir, file);
const overrideFilePath = path.join(overrideDir, file);
const distFilePath = path.join(distDir, file);
fs.readdirSync(defaultDir).forEach((file) => {
const defaultFilePath = path.join(defaultDir, file);
const overrideFilePath = path.join(overrideDir, file);
const distFilePath = path.join(distDir, file);

if (fs.lstatSync(defaultFilePath).isDirectory()) {
processDirectory(defaultFilePath, overrideFilePath, distFilePath);
} else {
const ext = path.extname(file).toLowerCase();
console.log(`Processando arquivo: ${file} com extensão: ${ext}`);
if (ext === '.json') {
mergeJsonFiles(defaultFilePath, overrideFilePath, distFilePath);
} else if (['.img', '.svg', '.png', '.ico'].includes(ext)) {
console.log(`Tentando sobrescrever ${ext} com arquivo: ${overrideFilePath}`);
replaceFile(defaultFilePath, overrideFilePath, distFilePath);
}
}
});
if (fs.lstatSync(defaultFilePath).isDirectory()) {
processDirectory(defaultFilePath, overrideFilePath, distFilePath);
} else {
const ext = path.extname(file).toLowerCase();
console.log(`Processando arquivo: ${file} com extensão: ${ext}`);
if (ext === ".json") {
mergeJsonFiles(defaultFilePath, overrideFilePath, distFilePath);
} else if ([".img", ".svg", ".png", ".ico"].includes(ext)) {
console.log(
`Tentando sobrescrever ${ext} com arquivo: ${overrideFilePath}`
);
replaceFile(defaultFilePath, overrideFilePath, distFilePath);
}
}
});
}

const defaultRootDir = path.join(__dirname, '..', 'public');
const overrideRootDir = path.join(__dirname, '..', 'config', 'public');
const distRootDir = path.join(__dirname, '..', 'dist', 'public');
const defaultRootDir = path.join(__dirname, "..", "public");
const overrideRootDir = path.join(__dirname, "..", "config", "public");
const distRootDir = path.join(__dirname, "..", "dist", "public");

console.log('Copiando estrutura de diretórios...');
shell.cp('-R', path.join(__dirname, '..', 'public'), path.join(__dirname, '..', 'dist'));
console.log("Copiando estrutura de diretórios...");
shell.cp(
"-R",
path.join(__dirname, "..", "public"),
path.join(__dirname, "..", "dist")
);

console.log('Mesclando e sobrescrevendo arquivos...');
console.log("Mesclando e sobrescrevendo arquivos...");
processDirectory(defaultRootDir, overrideRootDir, distRootDir);

console.log('Processo de sobrescrição completo!');
console.log("Processo de sobrescrição completo!");
117 changes: 62 additions & 55 deletions server/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,60 +72,17 @@ export class AppModule implements NestModule {
}

static register(options): DynamicModule {
const imports = [
MongooseModule.forRoot(
options.db.connection_uri,
options.db.options
),
ConfigModule.forRoot({
load: [() => options || {}],
}),
ThrottlerModule.forRoot({
ttl: options.throttle.ttl,
limit: options.throttle.limit,
}),
UsersModule,
WikidataModule,
PersonalityModule,
ClaimModule,
ClaimReviewModule,
ReviewTaskModule,
ClaimRevisionModule,
HistoryModule,
StateEventModule,
SourceModule,
SpeechModule,
ParagraphModule,
SentenceModule,
StatsModule,
ViewModule,
EmailModule,
SitemapModule,
OryModule,
ReportModule,
CaptchaModule,
TopicModule,
ImageModule,
SearchModule,
FileManagementModule,
DebateModule,
EditorModule,
BadgeModule,
EditorParseModule,
NotificationModule,
CommentModule,
NameSpaceModule,
AutomatedFactCheckingModule,
CopilotChatModule,
UnattributedModule,
DailyReportModule,
SummarizationCrawlerModule,
ChatbotModule,
VerificationRequestModule,
FeatureFlagModule,
GroupModule,
HomeModule, // Home module must be the last imported module because it contains the root endpoint, may causing some endpoints to be confused as namespace parameters
];
const imports = [];
if (options.db.type === "mongodb") {
imports.push(
MongooseModule.forRoot(
options.db.connection_uri,
options.db.options
)
);
} else {
throw new Error("Invalid DB_TYPE in configuration");
}
if (options.feature_flag) {
imports.push(
UnleashModule.forRoot({
Expand All @@ -141,7 +98,57 @@ export class AppModule implements NestModule {
return {
module: AppModule,
global: true,
imports,
imports: [
...imports,
ConfigModule.forRoot({
load: [() => options || {}],
}),
ThrottlerModule.forRoot({
ttl: options.throttle.ttl,
limit: options.throttle.limit,
}),
UsersModule,
WikidataModule,
PersonalityModule.register(),
ClaimModule,
ClaimReviewModule,
ReviewTaskModule,
ClaimRevisionModule,
HistoryModule,
StateEventModule,
SourceModule,
SpeechModule,
ParagraphModule,
SentenceModule,
StatsModule,
ViewModule,
EmailModule,
SitemapModule,
OryModule,
ReportModule,
CaptchaModule,
TopicModule,
ImageModule,
SearchModule,
FileManagementModule,
DebateModule,
EditorModule,
BadgeModule,
EditorParseModule,
NotificationModule,
CommentModule,
NameSpaceModule,
AutomatedFactCheckingModule,
CopilotChatModule,
UnattributedModule,
DailyReportModule,
SummarizationCrawlerModule,
ChatbotModule,
VerificationRequestModule,
FeatureFlagModule,
GroupModule,
HomeModule, // Home module must be the last imported module because it contains the root endpoint, may causing some endpoints to be confused as namespace parameters
],
controllers: [RootController],
providers: [
{
Expand Down
2 changes: 1 addition & 1 deletion server/claim-review/claim-review.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ export class ClaimReviewService {
date: review.target.latestRevision.date,
slug: review.target.latestRevision.slug,
title: review.target.latestRevision.title,
claimId: review.target.latestRevision.claimId
claimId: review.target.latestRevision.claimId,
};

const isContentImage = claim.contentModel === ContentModelEnum.Image;
Expand Down
2 changes: 1 addition & 1 deletion server/claim-review/dto/create-claim-review.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
IsOptional,
IsString,
} from "class-validator";
import { Personality } from "../../personality/schemas/personality.schema";
import { Personality } from "../../personality/mongo/schemas/personality.schema";
import { Claim } from "../../claim/schemas/claim.schema";
import { ApiProperty } from "@nestjs/swagger";

Expand Down
Loading
Loading