rationalised directories

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 () {

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'

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'),

src/database-calls/insertPublished.mjs

@@ -1,6 +1,6 @@
 import { db } from "./db.mjs"
-import { isoDate } from "./utilities.mjs"
+import { isoDate } from "../utilities.mjs"
-import logger from "./logger.mjs"
+import logger from "../logger.mjs"
 const sampleRes = {
     createdNote: {
       id: '9i8urek4jtzhmtuh',

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')

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({

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() {

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, '')
-}

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){
 
+                }
             }
         }
         

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, '')
+}