diff --git a/README.md b/README.md index f7cbff9..8e30b2e 100644 --- a/README.md +++ b/README.md @@ -85,9 +85,9 @@ https://mastodon.cipherbliss.com # Cronjob ``` -12 12-14 * * * cd /home/tykayn/www/mastodon_multi_account && nvm use 16 && node helpers/tkblogPost.mjs | tee -a /home/tykayn/log_autopost.txt 2>&1 +12 12-14 * * * cd /home/tykayn/www/mastodon_multi_account && nvm use 16 && node helpers/tykayn_blog.mjs | tee -a /home/tykayn/log_autopost.txt 2>&1 0 7 * * * cd /home/tykayn/www/mastodon_multi_account && nvm use 16 && node helpers/wiki_osm.mjs | tee -a /home/tykayn/log_autopost.txt 2>&1 -0 0 * * * cd /home/tykayn/www/mastodon_multi_account && nvm use 16 && node helpers/postQzine.mjs | tee -a /home/tykayn/log_autopost.txt 2>&1 +0 0 * * * cd /home/tykayn/www/mastodon_multi_account && nvm use 16 && node helpers/qzine_article.mjs | tee -a /home/tykayn/log_autopost.txt 2>&1 # version avec scripts bash 0 7 * * * su tykayn -c "bash /home/tykayn/wiki_osm.sh" */30 * * * * su tykayn -c "bash /home/tykayn/meme_poster_random.sh" diff --git a/assets/qzine_post_1.jpg b/assets/qzine_post_1.jpg new file mode 100755 index 0000000..8963d28 Binary files /dev/null and b/assets/qzine_post_1.jpg differ diff --git a/assets/qzine_post_2.jpg b/assets/qzine_post_2.jpg new file mode 100755 index 0000000..8963d28 Binary files /dev/null and b/assets/qzine_post_2.jpg differ diff --git a/assets/qzine_post_3.jpg b/assets/qzine_post_3.jpg new file mode 100755 index 0000000..8963d28 Binary files /dev/null and b/assets/qzine_post_3.jpg differ diff --git a/helpers/cipherbliss_post.mjs b/helpers/cipherbliss_post.mjs index 8980751..abd6790 100644 --- a/helpers/cipherbliss_post.mjs +++ b/helpers/cipherbliss_post.mjs @@ -4,8 +4,8 @@ import sendPostMastodon, {randomIntFromInterval, findFirstImageInContent} from ' const __dirname = path.resolve(); const tkpostsjson = JSON.parse(fs.readFileSync(__dirname + "/assets/documents/cipherbliss_tkwp_posts.json", 'utf-8')) -const reallySendPost = false; -// const reallySendPost = true; +let reallySendPost = false; + reallySendPost = true; export function getRandomElementOfArray(listItems) { @@ -15,6 +15,7 @@ export function getRandomElementOfArray(listItems) { function getRandomLink() { let filteredLinks = tkpostsjson.filter(elem => elem.post_status === 'publish') + filteredLinks = filteredLinks.filter(elem => elem.post_type === 'post') return getRandomElementOfArray(filteredLinks) } @@ -22,7 +23,7 @@ function postLink() { let postObject = getRandomLink() console.log("envoi de post de blog cipherbliss par le compte tykayn") - + console.log(postObject) let filteredExcerpt = postObject.post_content.replace(/<[^>]+>/g, '') let counterLength = filteredExcerpt.length; @@ -34,15 +35,17 @@ function postLink() { let configPost = { author: 'tykayn', - image: 'cipherbliss_post_' + randomIntFromInterval(1 - 3) + '.jpg', + image: 'cipherbliss_post_' + randomIntFromInterval(1 , 3) + '.jpg', message: `# [${postObject.post_title}](https://www.cipherbliss.com/${postObject.post_name}) -* ${postObject.post_date} - ${postObject.guid} -${filteredExcerpt} +* ${postObject.post_date} + +> ${filteredExcerpt} * #tykayn #cipherbliss #blog`, reallySendPost } console.log("configPost.message", configPost.message) + console.log("configPost.image", configPost.image) sendPostMastodon(configPost) diff --git a/helpers/postQzine.mjs b/helpers/qzine_article.mjs similarity index 82% rename from helpers/postQzine.mjs rename to helpers/qzine_article.mjs index a6d18b0..1758a2e 100644 --- a/helpers/postQzine.mjs +++ b/helpers/qzine_article.mjs @@ -1,6 +1,7 @@ import fs from "fs"; import path from 'path'; -import sendPostMastodon from './utils.mjs' +import sendPostMastodon, {randomIntFromInterval, findFirstImageInContent} from './utils.mjs' + /** * @@ -16,8 +17,8 @@ import sendPostMastodon from './utils.mjs' const __dirname = path.resolve(); const list_posts_json = JSON.parse(fs.readFileSync(__dirname + "/assets/documents/qzine_posts_all.json", 'utf-8')) -// const reallySendPost = false; -const reallySendPost = true; +let reallySendPost = false; +reallySendPost = true; export function getRandomElementOfArray(listItems) { @@ -46,7 +47,8 @@ function postLink() { let configPost = { author: 'qzine', - image: 'qzine_default.jpg', + // image: 'qzine_default.jpg', + image: 'qzine_post_' + randomIntFromInterval(1 , 3) + '.jpg', message: `# [ !Qzine - ${postObject.title.rendered}](${postObject.link}) * ${postObject.date} - ${postObject.link} @@ -54,7 +56,7 @@ ${filteredExcerpt} * #qzine #qzineblog #blog #sexe #relations #éducation #plaisir #sociologie`, reallySendPost } - console.log("configPost.message", configPost.message) + // console.log("configPost.message", configPost.message) sendPostMastodon(configPost) } diff --git a/helpers/tkblogPost.mjs b/helpers/tykayn_blog.mjs similarity index 93% rename from helpers/tkblogPost.mjs rename to helpers/tykayn_blog.mjs index 749357e..0dd440f 100644 --- a/helpers/tkblogPost.mjs +++ b/helpers/tykayn_blog.mjs @@ -4,8 +4,8 @@ import sendPostMastodon, {randomIntFromInterval} from './utils.mjs' const __dirname = path.resolve(); const tkpostsjson = JSON.parse(fs.readFileSync(__dirname + "/assets/documents/tykayn_wptkblog_posts.json", 'utf-8')) -const reallySendPost = false; -// const reallySendPost = true; +let reallySendPost = false; +reallySendPost = true; export function getRandomElementOfArray(listItems) { @@ -34,7 +34,7 @@ function postLink() { let configPost = { author: 'tykayn', - image: 'tk_blog_bannieres_oct2010-' + randomIntFromInterval(1 - 10) + '.jpg', + image: 'tk_blog_bannieres_oct2010-' + randomIntFromInterval(1 , 10) + '.jpg', message: `# [${postObject.post_title}](${postObject.guid}) * ${postObject.post_date} - ${postObject.guid}