Compare commits

..

No commits in common. "019aafa647bb0807909a172cde0e7ce31ffdacb0" and "9cc5307c594d922ca39ca9d45583c40b6f640066" have entirely different histories.

5 changed files with 4 additions and 13 deletions

2
.env Normal file
View file

@ -0,0 +1,2 @@
DATABASE_URL=sqlite://./blogdor.db
DATABASE_FILE=./blogdor.db

1
.gitignore vendored
View file

@ -1,4 +1,3 @@
/target /target
blogdor.db blogdor.db
secrets secrets
.env

View file

@ -7,8 +7,7 @@ Requires=network-online.target
Type=exec Type=exec
User=blogdor User=blogdor
Group=blogdor Group=blogdor
EnvironmentFile=/var/lib/blogdor/.env ExecStart=/var/lib/blogdor/blogdor -e /var/lib/blogdor/.env
ExecStart=/var/lib/blogdor/blogdor
TimeoutStopSec=5s TimeoutStopSec=5s
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=512 LimitNPROC=512

View file

@ -1,8 +0,0 @@
DATABASE_URL=sqlite://blogdor.db
DATABASE_FILE=./blogdor.db
ZULIP_TOKEN=a_token
ZULIP_URL=http://localhost:8000
BLOGDOR_TO_ZULIP_EMAIL=blogdor-incoming-bot@zulip-host
ZULIP_TO_BLOGDOR_EMAIL=blogdor-outgoing-bot@zulip-host
ZULIP_CHANNEL=35
BLOGDOR_TOKEN=another_token

View file

@ -304,10 +304,9 @@ async fn check_feed(
feed_url: url.clone(), feed_url: url.clone(),
title: post title: post
.title .title
.clone()
.map(|t| t.content) .map(|t| t.content)
.unwrap_or("Blogdor Says: NO POST TITLE".to_string()), .unwrap_or("Blogdor Says: NO POST TITLE".to_string()),
published: post.posted().unwrap_or(now), published: post.published.unwrap_or(now),
received: now, received: now,
feed_description: feed.description.to_owned().map(|d| d.content), feed_description: feed.description.to_owned().map(|d| d.content),
body: post.content.and_then(|c| { body: post.content.and_then(|c| {