From 0ee7a6940a999eb7cc2024a38fa894db1f8d4caf Mon Sep 17 00:00:00 2001 From: Umputun Date: Sun, 8 Jul 2018 23:54:00 -0500 Subject: [PATCH] increase last to 1000 for reply rss, add to readme --- README.md | 1 + backend/app/rest/api/rss.go | 3 +-- backend/remark.rest | 7 +++++-- backend/scripts/restore-backup.sh | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) mode change 100644 => 100755 backend/scripts/restore-backup.sh diff --git a/README.md b/README.md index a56efaec..c9f7705d 100644 --- a/README.md +++ b/README.md @@ -446,6 +446,7 @@ Sort can be `time`, `active` or `score`. Supported sort order with prefix -/+, i * `GET /api/v1/rss/post?site=site-id&url=post-url` - rss feed for a post * `GET /api/v1/rss/site?site=site-id` - rss feed for given site +* `GET /api/v1/rss/reply?site=site-id&user=user-id` - rss feed for replies to user's comments ### Admin diff --git a/backend/app/rest/api/rss.go b/backend/app/rest/api/rss.go index 72a0ed40..1b4a9695 100644 --- a/backend/app/rest/api/rss.go +++ b/backend/app/rest/api/rss.go @@ -16,7 +16,7 @@ import ( ) const maxRssItems = 20 -const maxLastCommentsReply = 100 +const maxLastCommentsReply = 1000 const maxReplyDuration = 30 * time.Minute // ui uses links like #remark42__comment- @@ -104,7 +104,6 @@ func (s *Rest) rssRepliesCtrl(w http.ResponseWriter, r *http.Request) { return nil, errors.Wrap(e, "can't get last comments") } comments = s.adminService.alterComments(comments, r) - replies := []store.Comment{} for _, c := range comments { if len(replies) > maxRssItems || c.Timestamp.Add(maxReplyDuration).Before(time.Now()) { diff --git a/backend/remark.rest b/backend/remark.rest index c3430b57..94a20dc8 100644 --- a/backend/remark.rest +++ b/backend/remark.rest @@ -99,13 +99,16 @@ PUT {{host}}/api/v1/admin/user/disqus_grigorybakunov?site=remark&block=0 GET {{host}}/api/v1/admin/blocked?site={{site}} ### delete comment by id -DELETE {{host}}/api/v1/admin/comment/3665976683?site=remark&url={{url}} +DELETE {{host}}/api/v1/admin/comment/3665976683?site={{site}}&url={{url}} ### get post info GET {{host}}/api/v1/info?site={{site}}&url=https://radio-t.com/p/2018/05/08/prep-597/ ### post rss -GET {{host}}/api/v1/rss/post?site=remark&url={{url}} +GET {{host}}/api/v1/rss/post?site=={{site}}&url={{url}} + +### reply rss +GET {{host}}/api/v1/rss/reply?site=radiot&user=github_ef0f706a79cc24b17bbbb374cd234a691d034128 ### site rss PUT {{host}}/api/v1/rss/site?site=remark diff --git a/backend/scripts/restore-backup.sh b/backend/scripts/restore-backup.sh old mode 100644 new mode 100755 index 06775c7f..f32a231c --- a/backend/scripts/restore-backup.sh +++ b/backend/scripts/restore-backup.sh @@ -5,8 +5,7 @@ BACKUP_PATH=${BACKUP_PATH:-./var} echo "unpack $1" gunzip -c ${BACKUP_PATH}/$1 >/tmp/backup.remark -size=`stat -c "%s" /tmp/backup.remark` -echo "source file size ${size}" +ls -la /tmp/backup.remark curl -X POST -H "Content-Type: application/json" --data-binary @/tmp/backup.remark "http://127.0.0.1:8081/api/v1/admin/import?site=${2}&provider=native&secret=${SECRET}" rm /tmp/backup.remark