diff --git a/src/controllers/noteController.js b/src/controllers/noteController.js index 1d8fcd6..d9ba7cb 100644 --- a/src/controllers/noteController.js +++ b/src/controllers/noteController.js @@ -2,31 +2,32 @@ import {Logger} from '../models/logger'; import {ControllerHandler} from './controllerHandler'; import {API} from '../models/api/api'; import {Database} from '../models/database/database' -import {PermaLink} from '../models/permalinks/permalink'; +import {Notes} from '../models/notes/notes'; export class NoteController extends ControllerHandler { static async newNote(req, res, next) { let errors = new API.errors(res); // Logger.debug(JSON.stringify(req.user, false, 4)); - let content = req.body.text || undefined; + let content = req.body.text || null; let creatorid = req.user.id || undefined; let group = req.body.parentgroup || undefined; let order = req.body.order || undefined; let user = req.user || undefined; - if (!creatorid || !user) errors.addError(403, 'Forbidden'); - - if (errors.count() > 0) { + if (!creatorid || !user) { + errors.addError(403, 'Forbidden'); errors.endpoint(); next(); return; } + + if (!group) group == 0; - + // what the hecking heck is this code supoased to do you hecking idiot diff --git a/src/models/database/baseDatabase.js b/src/models/database/baseDatabase.js index b2f9d40..28c321e 100644 --- a/src/models/database/baseDatabase.js +++ b/src/models/database/baseDatabase.js @@ -95,7 +95,10 @@ export class BaseDatabase { primaryKey: true, unique: true }, - content: Sequelize.TEXT, + content: { + type: Sequelize.TEXT, + allowNull: true + }, parentgroup: { type: Sequelize.BIGINT, allowNull: true diff --git a/src/models/notes/notes.js b/src/models/notes/notes.js index 5471d43..1bad473 100644 --- a/src/models/notes/notes.js +++ b/src/models/notes/notes.js @@ -3,11 +3,33 @@ import {Database} from '../database/database'; export class Notes extends Groups { static async newNote(id, content, creatorid, order) { + + Database.notes.newNote(id, null, ) } + static async genID() { + return new Date().getTime(); + } + + static async genEndpoint() { + const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + + let endpoint; + while (true) { + endpoint = 'N'; + for (let i = 0; i < 7; i++) + endpoint += possible[Math.floor(Math.random() * possible.length)]; + + if (await Database.notes.getNoteByEndpoint(endpoint) == -1) + break; + } + + return endpoint; + } + static async getNoteByEndpoint(endpoint) { - + } static async makeNotePerma(id, endpoint) { diff --git a/src/models/permalinks/permalink.js b/src/models/permalinks/permalink.js index 752c78f..a8373e1 100644 --- a/src/models/permalinks/permalink.js +++ b/src/models/permalinks/permalink.js @@ -10,7 +10,7 @@ export class PermaLink { let endpoint; while (true) { - endpoint = 'N'; + endpoint = 'P'; for (let i = 0; i < 7; i++) endpoint += possible[Math.floor(Math.random() * possible.length)];