diff --git a/src/checkAndPublish.mjs b/src/checkAndPublish.mjs index 6238580..b21d980 100644 --- a/src/checkAndPublish.mjs +++ b/src/checkAndPublish.mjs @@ -1,9 +1,9 @@ import getNewPrompt from "./getNewPrompt.mjs" -import createNote from "./createNote.mjs" +import createNote from "./firefish-calls/createNote.mjs" import makeText from "./makeText.mjs" -import insertPublished from "./insertPublished.mjs" +import insertPublished from "./database-calls/insertPublished.mjs" import logger from "./logger.mjs" -import todaysPromptAlreadyPublished from "./todaysPromptAlreadyPublished.mjs" +import todaysPromptAlreadyPublished from "./database-calls/todaysPromptAlreadyPublished.mjs" export default async function checkAndPublish () { diff --git a/src/db.mjs b/src/database-calls/db.mjs similarity index 91% rename from src/db.mjs rename to src/database-calls/db.mjs index a27b87e..3dc8bb3 100644 --- a/src/db.mjs +++ b/src/database-calls/db.mjs @@ -1,5 +1,5 @@ import Knex from 'knex' -import logger from './logger.mjs' +import logger from '../logger.mjs' export const db = Knex({ client: 'sqlite3', // or 'better-sqlite3' diff --git a/src/getAcceptablePrompts.mjs b/src/database-calls/getAcceptablePrompts.mjs similarity index 90% rename from src/getAcceptablePrompts.mjs rename to src/database-calls/getAcceptablePrompts.mjs index d3b0a6d..b1f524d 100644 --- a/src/getAcceptablePrompts.mjs +++ b/src/database-calls/getAcceptablePrompts.mjs @@ -1,6 +1,6 @@ -import logger from "./logger.mjs" +import logger from "../logger.mjs" import { db } from "./db.mjs" -import config from "./config.mjs" +import config from "../config.mjs" const blocklist = db.union([ db('bad_words').select('word'), diff --git a/src/insertPublished.mjs b/src/database-calls/insertPublished.mjs similarity index 94% rename from src/insertPublished.mjs rename to src/database-calls/insertPublished.mjs index 1d8d3f9..c5ff660 100644 --- a/src/insertPublished.mjs +++ b/src/database-calls/insertPublished.mjs @@ -1,6 +1,6 @@ import { db } from "./db.mjs" -import { isoDate } from "./utilities.mjs" -import logger from "./logger.mjs" +import { isoDate } from "../utilities.mjs" +import logger from "../logger.mjs" const sampleRes = { createdNote: { id: '9i8urek4jtzhmtuh', diff --git a/src/todaysPromptAlreadyPublished.mjs b/src/database-calls/todaysPromptAlreadyPublished.mjs similarity index 87% rename from src/todaysPromptAlreadyPublished.mjs rename to src/database-calls/todaysPromptAlreadyPublished.mjs index 6297e2d..22e0063 100644 --- a/src/todaysPromptAlreadyPublished.mjs +++ b/src/database-calls/todaysPromptAlreadyPublished.mjs @@ -1,5 +1,5 @@ import { db } from "./db.mjs"; -import { isoDate } from "./utilities.mjs"; +import { isoDate } from "../utilities.mjs"; export default async function todaysPromptAlreadyPublished() { const number = await db('published') .count('* as count') diff --git a/src/createNote.mjs b/src/firefish-calls/createNote.mjs similarity index 96% rename from src/createNote.mjs rename to src/firefish-calls/createNote.mjs index 855973f..1543c79 100644 --- a/src/createNote.mjs +++ b/src/firefish-calls/createNote.mjs @@ -1,5 +1,5 @@ import { apiKey } from './API.mjs' -import logger from './logger.mjs' +import logger from '../logger.mjs' //JUST FOR USE IN LOCAL ENVIRONMENT import { Agent, setGlobalDispatcher } from 'undici' const agent = new Agent({ diff --git a/src/getNewPrompt.mjs b/src/getNewPrompt.mjs index bb98ada..85ffe34 100644 --- a/src/getNewPrompt.mjs +++ b/src/getNewPrompt.mjs @@ -1,5 +1,5 @@ import logger from "./logger.mjs" -import getAcceptablePrompts from "./getAcceptablePrompts.mjs" +import getAcceptablePrompts from "./database-calls/getAcceptablePrompts.mjs" import config from "./config.mjs" export default async function getNewPrompt() { diff --git a/src/makeText.mjs b/src/makeText.mjs index 9bf4ab9..af46c6b 100644 --- a/src/makeText.mjs +++ b/src/makeText.mjs @@ -1,6 +1,6 @@ import logger from "./logger.mjs" - +import { removeUrls } from "./utilities.mjs" const sampleData = { word: 'malt', count: 1520084, @@ -47,6 +47,4 @@ export default function makeText(prompt) { return text + meaningsText + postScript } -function removeUrls(string) { - return string.replace(/(https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z]{2,}(\.[a-zA-Z]{2,})(\.[a-zA-Z]{2,})?\/[a-zA-Z0-9]{2,}|((https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z]{2,}(\.[a-zA-Z]{2,})(\.[a-zA-Z]{2,})?)|(https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z0-9]{2,}\.[a-zA-Z0-9]{2,}\.[a-zA-Z0-9]{2,}(\.[a-zA-Z0-9]{2,})?/g, '') -} + diff --git a/src/social-interaction/receiveMention.mjs b/src/social-interaction/receiveMention.mjs index 7b8591b..945ae93 100644 --- a/src/social-interaction/receiveMention.mjs +++ b/src/social-interaction/receiveMention.mjs @@ -1,5 +1,5 @@ import logger from "../logger.mjs" -import getAcceptablePrompts from "../getAcceptablePrompts.mjs" +import getAcceptablePrompts from "../database-calls/getAcceptablePrompts.mjs" import { checkSpelling } from "spellchecker" export default async function (note) { @@ -13,7 +13,9 @@ export default async function (note) { const word = textArray[0] if(checkSpelling(word)){ if(await getAcceptablePrompts().indexOf(word)!=-1){ - + if(/*wordIsAlreadyInBuffer*/true){ + + } } } diff --git a/src/utilities.mjs b/src/utilities.mjs index 84aba50..14705a7 100644 --- a/src/utilities.mjs +++ b/src/utilities.mjs @@ -1,3 +1,7 @@ export function isoDate(date=Date.now()){ return new Date().toISOString().split('T')[0] +} + +export function removeUrls(string) { + return string.replace(/(https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z]{2,}(\.[a-zA-Z]{2,})(\.[a-zA-Z]{2,})?\/[a-zA-Z0-9]{2,}|((https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z]{2,}(\.[a-zA-Z]{2,})(\.[a-zA-Z]{2,})?)|(https:\/\/www\.|http:\/\/www\.|https:\/\/|http:\/\/)?[a-zA-Z0-9]{2,}\.[a-zA-Z0-9]{2,}\.[a-zA-Z0-9]{2,}(\.[a-zA-Z0-9]{2,})?/g, '') } \ No newline at end of file