misc. patches #31

Merged
yume merged 2 commits from develop into master 2024-11-19 06:18:33 -06:00
2 changed files with 2 additions and 1 deletions

View file

@ -96,7 +96,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
// Check if the circular reference will occur // Check if the circular reference will occur
const checkCircle = async (folderId: string, limit: number = 32): Promise<boolean> => { const checkCircle = async (folderId: string, limit: number = 32): Promise<boolean> => {
if (limit <= 0) { if (limit <= 0) {
return false; return true;
} }
const folder2 = await this.driveFoldersRepository.findOneByOrFail({ const folder2 = await this.driveFoldersRepository.findOneByOrFail({
id: folderId, id: folderId,

View file

@ -30,6 +30,7 @@ export function generateCSP(hashedMap: Map<string, CSPHashed>, options: {
[ [
'\'self\'', '\'self\'',
'data:', 'data:',
'blob:',
// 'https://avatars.githubusercontent.com', // uncomment this for contributor avatars to work // 'https://avatars.githubusercontent.com', // uncomment this for contributor avatars to work
options.mediaProxy options.mediaProxy
].filter(Boolean)], ].filter(Boolean)],