From 3ae3cabd802770d7a7265efd4587c62835c2457c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 31 Oct 2023 20:31:47 +0600 Subject: [PATCH] update sample folder --- runner/config.json | 87 --------------------- runner/sample.docker-compose.yml | 23 ------ sample/.env | 5 -- sample/config.json | 129 ++++++++++--------------------- sample/docker-compose.yml | 18 ++--- 5 files changed, 48 insertions(+), 214 deletions(-) delete mode 100644 runner/config.json delete mode 100644 runner/sample.docker-compose.yml delete mode 100644 sample/.env diff --git a/runner/config.json b/runner/config.json deleted file mode 100644 index e080bd9..0000000 --- a/runner/config.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "database": { - "url": "jdbc:postgresql://127.0.0.1:8091/test", - "username": "test", - "password": "test", - "driver": "org.postgresql.Driver" - }, - "botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678", - "plugins": [ - "dev.inmo.plaguposter.posts.Plugin", - "dev.inmo.plaguposter.posts.registrar.Plugin", - "dev.inmo.plaguposter.ratings.Plugin", - "dev.inmo.plaguposter.ratings.source.Plugin", - "dev.inmo.plaguposter.ratings.selector.Plugin", - "dev.inmo.plaguposter.ratings.gc.Plugin", - "dev.inmo.plaguposter.triggers.selector_with_timer.Plugin", - "dev.inmo.plagubot.plugins.inline.queries.Plugin", - "dev.inmo.plaguposter.triggers.command.Plugin", - "dev.inmo.plaguposter.posts.panel.Plugin", - "dev.inmo.plaguposter.common.CommonPlugin", - "dev.inmo.plaguposter.triggers.timer.Plugin", - "dev.inmo.plaguposter.triggers.timer.disablers.ratings.Plugin", - "dev.inmo.plaguposter.triggers.timer.disablers.autoposts.Plugin" - ], - "posts": { - "chats": { - "targetChat": 12345678, - "cacheChat": 12345678, - "sourceChat": 12345678, - "targetChats": [12345678], - "_note": "You must set targetChat or targetChats with at least one object" - } - }, - "ratingsPolls": { - "variants": { - "Cool": 2, - "Ok": 1, - "Not ok": -1, - "Inappropriate": -2, - "Results": 0 - }, - "autoAttach": true, - "ratingOfferText": "What do you think about it?" - }, - "selector": { - "items": [ - { - "time": { - "from": "00:00", - "to": "23:59" - }, - "rating": { - "prefer": "max" - } - }, - { - "time": { - "from": "23:59", - "to": "00:00" - }, - "rating": { - "prefer": "max" - } - } - ] - }, - "timer_trigger": { - "krontab": "0 30 2/4 * *" - }, - "panel": { - "textPrefix": "Post management:", - "buttonsPerRow": 2, - "parseMode": "MarkdownV2", - "deleteButtonText": "Delete" - }, - "publish_command": { - "panelButtonText": "Publish" - }, - "gc": { - "autoclear": { - "rating": -1, - "autoClearKrontab": "0 0 0 * *", - "skipPostAge": 86400 - }, - "immediateDrop": -6 - } -} diff --git a/runner/sample.docker-compose.yml b/runner/sample.docker-compose.yml deleted file mode 100644 index e03cc1e..0000000 --- a/runner/sample.docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: "3.4" - -services: - plaguposter_postgres: - image: postgres:15.4-bullseye - container_name: "plaguposter_postgres" - restart: "unless-stopped" - environment: - POSTGRES_USER: "test" - POSTGRES_PASSWORD: "test" - POSTGRES_DB: "test" - volumes: - - "./db/:/var/lib/postgresql/data" - ports: - - "127.0.0.1:8091:5432" - plaguposter: - image: insanusmokrassar/plaguposter:latest - container_name: "plaguposter" - restart: "unless-stopped" - volumes: - - "./config.json:/config.json" - depends_on: - - "plaguposter_postgres" diff --git a/sample/.env b/sample/.env deleted file mode 100644 index 717caa3..0000000 --- a/sample/.env +++ /dev/null @@ -1,5 +0,0 @@ -DATA_PATH=. - -PG_USER=test_user -PG_PASSWORD=test_password -PG_DB=test_db diff --git a/sample/config.json b/sample/config.json index a8fd9be..e080bd9 100644 --- a/sample/config.json +++ b/sample/config.json @@ -1,131 +1,80 @@ { "database": { - "url": "jdbc:postgresql://postgres/test_db", - "username": "test_user", - "password": "test_password", + "url": "jdbc:postgresql://127.0.0.1:8091/test", + "username": "test", + "password": "test", "driver": "org.postgresql.Driver" }, - "botToken": "1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi", + "botToken": "1234567890:ABCDEFGHIJKLMNOP_qrstuvwxyz12345678", "plugins": [ "dev.inmo.plaguposter.posts.Plugin", "dev.inmo.plaguposter.posts.registrar.Plugin", "dev.inmo.plaguposter.ratings.Plugin", "dev.inmo.plaguposter.ratings.source.Plugin", "dev.inmo.plaguposter.ratings.selector.Plugin", - "dev.inmo.plaguposter.triggers.selector_with_timer.Plugin", "dev.inmo.plaguposter.ratings.gc.Plugin", + "dev.inmo.plaguposter.triggers.selector_with_timer.Plugin", "dev.inmo.plagubot.plugins.inline.queries.Plugin", - "dev.inmo.plaguposter.triggers.command.Plugin" + "dev.inmo.plaguposter.triggers.command.Plugin", + "dev.inmo.plaguposter.posts.panel.Plugin", + "dev.inmo.plaguposter.common.CommonPlugin", + "dev.inmo.plaguposter.triggers.timer.Plugin", + "dev.inmo.plaguposter.triggers.timer.disablers.ratings.Plugin", + "dev.inmo.plaguposter.triggers.timer.disablers.autoposts.Plugin" ], "posts": { "chats": { - "targetChat": -1001234567890, - "cacheChat": -1001234567890, - "sourceChat": -1001234567890 - }, - "autoRemoveMessages": true + "targetChat": 12345678, + "cacheChat": 12345678, + "sourceChat": 12345678, + "targetChats": [12345678], + "_note": "You must set targetChat or targetChats with at least one object" + } }, "ratingsPolls": { "variants": { - "Круть": 2, - "Ок": 1, - "Не ок": -1, - "Совсем не ок": -2, - "Посмотреть результаты": 0 + "Cool": 2, + "Ok": 1, + "Not ok": -1, + "Inappropriate": -2, + "Results": 0 }, "autoAttach": true, - "ratingOfferText": "How do you like it?" + "ratingOfferText": "What do you think about it?" }, "selector": { "items": [ { "time": { - "from": "23:00", + "from": "00:00", "to": "23:59" }, "rating": { - "min": -1.0, - "max": 2.0, - "prefer": "max", - "otherwise": { - "rating": { - "min": 2.0, - "prefer": "min", - "postAge": 86400 - } - }, - "postAge": 86400 + "prefer": "max" } }, { "time": { - "from": "00:00", - "to": "06:59" + "from": "23:59", + "to": "00:00" }, "rating": { - "min": -1.0, - "max": 2.0, - "prefer": "max", - "otherwise": { - "rating": { - "min": 2.0, - "prefer": "min", - "postAge": 86400 - } - }, - "postAge": 86400 - } - }, - { - "time": { - "from": "07:00", - "to": "12:00" - }, - "rating": { - "min": 1.0, - "prefer": "min", - "otherwise": { - "rating": { - "max": 1.0, - "prefer": "max", - "postAge": 86400 - } - }, - "postAge": 86400 - } - }, - { - "time": { - "from": "12:00", - "to": "16:00" - }, - "rating": { - "min": 2.0, - "prefer": "min", - "otherwise": { - "rating": { - "max": 2.0, - "prefer": "max", - "postAge": 86400 - } - }, - "postAge": 86400 - } - }, - { - "time": { - "from": "16:00", - "to": "23:00" - }, - "rating": { - "prefer": "max", - "postAge": 86400 + "prefer": "max" } } ] }, "timer_trigger": { - "krontab": "0 30 */5 * *" + "krontab": "0 30 2/4 * *" + }, + "panel": { + "textPrefix": "Post management:", + "buttonsPerRow": 2, + "parseMode": "MarkdownV2", + "deleteButtonText": "Delete" + }, + "publish_command": { + "panelButtonText": "Publish" }, "gc": { "autoclear": { @@ -133,6 +82,6 @@ "autoClearKrontab": "0 0 0 * *", "skipPostAge": 86400 }, - "immediateDrop": -2 + "immediateDrop": -6 } } diff --git a/sample/docker-compose.yml b/sample/docker-compose.yml index dbdf181..e03cc1e 100644 --- a/sample/docker-compose.yml +++ b/sample/docker-compose.yml @@ -2,22 +2,22 @@ version: "3.4" services: plaguposter_postgres: - image: postgres + image: postgres:15.4-bullseye container_name: "plaguposter_postgres" restart: "unless-stopped" environment: - POSTGRES_USER: "${PG_USER}" - POSTGRES_PASSWORD: "${PG_PASSWORD}" - POSTGRES_DB: "${PG_DB}" + POSTGRES_USER: "test" + POSTGRES_PASSWORD: "test" + POSTGRES_DB: "test" volumes: - - "${DATA_PATH}/db/:/var/lib/postgresql/" + - "./db/:/var/lib/postgresql/data" + ports: + - "127.0.0.1:8091:5432" plaguposter: - image: insanusmokrassar/plaguposter + image: insanusmokrassar/plaguposter:latest container_name: "plaguposter" restart: "unless-stopped" volumes: - - "${DATA_PATH}/config.json:/config.json" - links: - - "plaguposter_postgres:postgres" + - "./config.json:/config.json" depends_on: - "plaguposter_postgres"