From fa3c37627be33197d66d22b6fa6f17546121b21a Mon Sep 17 00:00:00 2001 From: Andrzej Stepien Date: Wed, 16 Aug 2023 12:41:38 +0200 Subject: [PATCH] remove try/catches from inner layer --- checkAndPublish.mjs | 3 +-- config.mjs | 3 +-- data/database-testing | Bin 39145472 -> 39145472 bytes data/scripts/deleteMisspelled.mjs | 11 +-------- database-calls/db.mjs | 34 +-------------------------- database-calls/insertPublished.mjs | 5 ---- firefish-calls/createNote.mjs | 4 ---- logger.mjs | 2 +- social-interaction/handleMention.mjs | 5 ++-- 9 files changed, 7 insertions(+), 60 deletions(-) diff --git a/checkAndPublish.mjs b/checkAndPublish.mjs index ec0c0cf..42ff416 100644 --- a/checkAndPublish.mjs +++ b/checkAndPublish.mjs @@ -12,8 +12,7 @@ export default async function checkAndPublish () { if(!await todaysPromptAlreadyPublished()){ try { const prompt = await tableIsNotEmpty('buffer') ? await getPromptFromBuffer() : await getNewPrompt() - - logger.trace("prompt acquired successfully!") + logger.trace({prompt:prompt},"prompt acquired successfully!") try { const text = makeText(prompt) try { diff --git a/config.mjs b/config.mjs index deb2f34..4809264 100644 --- a/config.mjs +++ b/config.mjs @@ -1,6 +1,5 @@ export default { maxCount : 30000000, - minCount : 200000, + minCount : 0, rarityBias: 0.7, - spamMode : false } \ No newline at end of file diff --git a/data/database-testing b/data/database-testing index 5a911f30f1058e14f4420b24ad94cbd57550a0a7..65e5932928fec0b34fc5f1a6c872f284cd3def68 100644 GIT binary patch delta 2538 zcmZA0cW@R}8;0?`Z}JjCOG4;1By6}X1mUpZ)CVH)2e0Fw(3}Qt$J2{tAW+f zYGgIG(yb;|hLveGwVGMYtrk{GtCiK-YGbvvvaEJidn?<@u{u~Ctxi^FtBcju>SlGf zdRRTJURH0bkJZ=eXZ5!RSOcv=)?jOhHPjkr4Yx*EBdt-^Xlsl$)*5Gxwm=)BYl?M>b*gomb-Hzib*6Qeb+(mjO|_<3ysPQf4C@>#&&s#XwPsoc)_K+}tI#^% znr+RoimYO5t~JlPz?yF@ur9PNvM#nRu`abPvld#5tjnz{tSc>BS6NqE*H|Uiwbo+m zI%|n_y|vU@W-YgFux_+&vTn9kSSzhttXr+ytlOu&2F>t5?V>wfD2 z>p^Rc^^o#YseMr)I` z*?QU9V!dL$YQ1K?ZoOf>X}x8=ZM|c?Yi+gOv);Epus*atvOc!TtWT^@tnrPPYlroX^{utj+GTxbeQ)iyez5jfKU#aOeb!Ibe(QjB(E8c>#roAcWc_CS zZXLFcSVyg6)^Y0(>rd-1>+cdpmMDTK;*o$DDj*RRk%UU9j4G&#YDh*3Qc)dgsDYZO zh1#ftx~PZxXn=-jgvLlm6J#J0P0{x}qDp zqX&AT7kZ-)`l28DV*mzX5C&rihGH0oV+2NG6h>nV#$p`CV*(~(5+>s$oQx?r1*hUP zoQ^YaCeFgy$i-AlL--!kF$3oy5BWG3Gf{x^Fbjn^AG0wBMJUEx%)8}iiCb_hZo}=k19##s ztio#CjeBq}?!*0f01sjf9>T*|i%0M%9>e2UhbQnPp2E|32G61t&*6EzfEV!+)?))U zViPvwWo*GKconbVb-aN$@fP03J9rmc@gCmC2lx;l;bWBH6MTx#@HxJ~HhhWg_zGWR z2fo3#*oj^E4&P%pe!w35h`rc{pRgYXa1cM^7yODt_zl0~Fpl6Tj^Q}|z@PXFe@99b z<@ZMv@kl@n6_ALENJ1r4Mio>=H6$Yisi=-L)Id$tLT%KEu2WztUDRFVh+mlzN zHf$Ezu_3iVbbn%KBr&H>EH^GLE;E)ly`Uh!C@)fSZ13Tbtfa=K=1wgvoW;VfvZP9^ z{BOpg z+@fikrRnpg&nljqTaaJ8phI?tj#=5=vU0kFvm?p-;&}FhD|+JvVgs>!_ZsIjjz6yZ$DXy`we~r)m#*7UeJNHoh*n(Pa6n4MNc+jdm&uA+ zF)MB*tQ4z)m1lSRu`+Q)y?W| z^{{$cy{z6=AFHp`&+2atum)O#tije0Yp6BM8g7lSMp~n+(bgDitToOWZ%wc!T9d3} ztjX4~)^XPH))eam>qP4$>tyQ`YpONPnr`u1&9Dlsnbs_;$U4GD2YnxSSJ#9T> zJ!?H@J#W2Wy=c8;y==W=y=uK?y>7i>y=lE=y=}c?y=%Q^ZMSwqUDgNIZtFwq zBkN=96YEoJkM)`Lx%GwhrS+Bdwe^klt@WL?*Vhbt?#We>j&$Q^`rHZ^|SSh z^{aK*I%5519kqV9{;>YE{#vf+3Plk^90{bL0#Z>CX{dzCsDgAMwXo5^+p(&c7Ia;74S|J;)(FSeN4moI#4#-6wIwBth=!DMbg0AR> z?&yJ@=!M?sgTCm8{uqFP7=*zXf}t3O;TVCD7=_UogRvNg@tA;#n1o|68OP!{9FHkD z0Vm=loQzX271J;s;s2O{Ld?W06ya2yhS`{dxtNFfSb$v02a#7(#v zw_qJ^#cf!R+i?f(#9i2cyKxUT;$GZ``>_d|@cv#ii;w`+5cknLW!*=Yz``C$H_yD`{AwI&#_ynI~ z4?e@^_yS+zD}0S_@GZW>UhKnu9Kb<*k23s#L--Lt;b;7UUvU^m@EeZecl?1r@mF-Y zVtoFHA&vx6Pywl^h%{6}WmG{rsv?PM$Ut?}Kuy#_ZPY>C*jCkxtt(B7CJ#iC2a)`-N*7LO{6rN$F!;n;MZ#gdyN$=$p|W+K)m zrTo+tu_@WHL{3z$lPO}!|7fs9W+-=c}qVi)q=61}_$?ckxSI|6~$f?Il { logger.trace("getAcceptablePrompt called") - try { return db('dictionary') .select('*') .where({ @@ -35,10 +34,6 @@ export const getAcceptablePrompts = async (word) => { .whereRaw('length(word) > 3') .whereNotNull('pronunciation') .orderByRaw('count desc') - } catch (error) { - logger.error("getAcceptablePrompts failed!") - throw error - } } @@ -51,31 +46,21 @@ export const getWords = async () => { } export const insertIntoBuffer = async (word,timestamp) => { - try { return db('buffer') .insert({ word:word, timestamp:timestamp }) - } catch (error) { - logger.error("buffer insert failed!") - throw error - } } export const valueExistsInColumn = async (table, column, value) => { - try { + const number = await db(table) .count('* as count') .where(column, value) return number[0].count > 0 - } catch (error) { - logger.error("valueExistsInColumn failed!") - throw error - } - } export const wordExistsInDictionary = async (word) => { @@ -91,13 +76,9 @@ export const wordIsAlreadyInBuffer = async (word) => { } export const tableIsNotEmpty = async (table) => { - try { const number = await db(table) .count('* as count') return number[0].count > 0 - } catch (error) { - throw error - } } export const getPromptFromBuffer = async () => { @@ -105,34 +86,21 @@ export const getPromptFromBuffer = async () => { const oldestWordInBuffer = await db('buffer').select('word').orderBy('timestamp', 'asc').limit(1) const word = oldestWordInBuffer[0].word if(!word){throw new Error("Requested oldest word in buffer but got an empty array! Is buffer empty?")} - try { const prompt = await getAcceptablePrompts(word) if(prompt.length===0){throw new Error("Prompt from buffer is not acceptable! Has it already been published? Have the acceptability criteria changed?")} return prompt[0] - } catch (error) { - logger.error("getPromptFromBuffer failed!") - throw error - } } export const deleteFromBuffer = async (word) => { logger.trace(`deleteFromBuffer called for word ${word}!`) - try { return db('buffer') .where('word', word) .del() - } catch (error) { - logger.error("deleteFromBuffer failed!") - } } export const getDatePublished = async (word) => { - try { return db('published') .select('date') .where('word',word) - } catch (error) { - throw error - } } diff --git a/database-calls/insertPublished.mjs b/database-calls/insertPublished.mjs index c4ad251..7317067 100644 --- a/database-calls/insertPublished.mjs +++ b/database-calls/insertPublished.mjs @@ -47,16 +47,11 @@ const sampleRes = { export default async function insertPublished(res, word) { logger.trace("insertPublished called") - try { return db('published') .insert({ id: res.createdNote.id, word, date: isoDate(sampleRes.createdNote.createdAt) }) - } catch (error) { - throw error - } - } //console.log(await insertPublished(sampleRes,'marmalade')) \ No newline at end of file diff --git a/firefish-calls/createNote.mjs b/firefish-calls/createNote.mjs index 28061b7..4378434 100644 --- a/firefish-calls/createNote.mjs +++ b/firefish-calls/createNote.mjs @@ -19,7 +19,6 @@ export default async function createNote(text,replyId) { cw:"Today's #micro365 prompt is:" } if(replyId){body.replyId=replyId} - try { const response = await firefish.post("notes/create",body) logger.info({ status: response.status, @@ -27,9 +26,6 @@ export default async function createNote(text,replyId) { data: response.data }) return response.data - } catch (error) { - throw error - } } diff --git a/logger.mjs b/logger.mjs index 4a8fd4b..3c1b596 100644 --- a/logger.mjs +++ b/logger.mjs @@ -16,7 +16,7 @@ const __dirname = path.dirname(__filename); // }) export default pino( { - level: 'info', + level: 'trace', formatters: { level: (label) => { return { level: label.toUpperCase() }; diff --git a/social-interaction/handleMention.mjs b/social-interaction/handleMention.mjs index c43a11d..c699963 100644 --- a/social-interaction/handleMention.mjs +++ b/social-interaction/handleMention.mjs @@ -21,8 +21,7 @@ export default async function handleMentions(body) { } const isRealWord = await note.isRealWord if (!isRealWord) { - createNote(`I'm afraid I can't do that, ${note.author}. That's not a 'real' word, at least as far as I'm aware! Have you checked the spelling? - You might just be too cool for me.`,note.id) + createNote(`I'm afraid I can't do that, ${note.author}. That's not a 'real' word, at least as far as I'm aware! Have you checked the spelling?`,note.id) return { code: "NOTREAL" } } if (await wordIsAlreadyInBuffer(word)) { @@ -33,7 +32,7 @@ export default async function handleMentions(body) { unacceptable = unacceptable.length===0 if (unacceptable) { if (await valueExistsInColumn('medical_dictionary', 'word', word)) { - createNote("I'm afraid I can't use any word that appears in my medical dictionary. I know this delivers some false positives, but it was the only way to avoid accidentally triggering people!",note.id) + createNote("I'm afraid I can't use any word that appears in my medical dictionary. I know this delivers some false positives, but it was the only way.",note.id) return { code: "MEDICAL" } }