diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e65a2a..87ba042 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,2 @@ -# v1.0.0, 2021-01-11 +# v1.0.0, 2021-01-15 * Initial release diff --git a/README.md b/README.md index bb8797d..a87c124 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

Feed Plugin for Flextype

-Version License Total downloads Flextype Discord +Version License Total downloads Flextype Discord

Feed plugin for Flextype supports Atom 1.0, RSS and JSON feed types and allows you to generate feeds for entries. @@ -12,7 +12,7 @@ The following dependencies need to be downloaded and installed for Feed Plugin. | Item | Version | Download | |---|---|---| -| [flextype](https://github.com/flextype/flextype) | 0.9.15 | [download](https://github.com/flextype/flextype/releases) | +| [flextype](https://github.com/flextype/flextype) | 0.9.16 | [download](https://github.com/flextype/flextype/releases) | | [twig](https://github.com/flextype-plugins/twig) | >=2.0.0 | [download](https://github.com/flextype-plugins/twig/releases) | ## Installation @@ -33,7 +33,7 @@ The following dependencies need to be downloaded and installed for Feed Plugin. ### Usage -Inside `project/config/plugins/feed/settings.yaml` you may create unlimited feed for you entries. +In `project/config/plugins/feed/settings.yaml` you may create unlimited feed for you entries. Lets create RSS, ATOM and JSON feed for blog collection: @@ -45,7 +45,6 @@ feed: title: Blog description: Blog description collection: true - length: 400 format: rss route: '/blog.rss' blog-atom: @@ -54,7 +53,6 @@ feed: title: Blog description: Blog description collection: true - length: 400 format: json route: '/blog.atom' blog-json: @@ -63,7 +61,6 @@ feed: title: Blog description: Blog description collection: true - length: 400 format: json route: '/blog.json' ``` diff --git a/plugin.php b/plugin.php index 226ff70..398bf16 100644 --- a/plugin.php +++ b/plugin.php @@ -6,29 +6,15 @@ $feed = flextype('registry')->get('plugins.feed.settings.feed'); if (isset($feed) and count($feed) > 0) { - foreach (flextype('registry')->get('plugins.feed.settings.feed') as $item) { + foreach ($feed as $item) { $cacheID = strings('feed-collection-' . $item['id'])->hash()->toString(); - flextype('emitter')->addListener('onEntriesCreate', function () use ($cacheID) { - flextype('cache')->delete($cacheID); - }); - - flextype('emitter')->addListener('onEntriesDelete', function () use ($cacheID) { - flextype('cache')->delete($cacheID); - }); - - flextype('emitter')->addListener('onEntriesMove', function () use ($cacheID) { - flextype('cache')->delete($cacheID); - }); - - flextype('emitter')->addListener('onEntriesCopy', function () use ($cacheID) { - flextype('cache')->delete($cacheID); - }); - - flextype('emitter')->addListener('onEntriesUpdate', function () use ($cacheID) { - flextype('cache')->delete($cacheID); - }); + flextype('emitter')->addListener('onEntriesCreate', fn () => flextype('cache')->delete($cacheID)); + flextype('emitter')->addListener('onEntriesDelete', fn () => flextype('cache')->delete($cacheID)); + flextype('emitter')->addListener('onEntriesMove', fn () => flextype('cache')->delete($cacheID)); + flextype('emitter')->addListener('onEntriesCopy', fn () => flextype('cache')->delete($cacheID)); + flextype('emitter')->addListener('onEntriesUpdate', fn () => flextype('cache')->delete($cacheID)); flextype()->get($item['options']['route'], function (Request $request, Response $response, array $args) use ($item, $cacheID) { diff --git a/plugin.yaml b/plugin.yaml index 4c89175..c235aa2 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -3,7 +3,7 @@ version: 1.0.0 description: Feed plugin for Flextype author: name: Sergey Romanenko - email: awilum@yandex.ru + email: sergey.romanenko@flextype.org url: https://flextype.org homepage: https://github.com/flextype-plugins/feed documentation: https://github.com/flextype-plugins/feed @@ -15,5 +15,5 @@ icon: license: MIT dependencies: - flextype: 0.9.15 + flextype: 0.9.16 twig: '>=2.0.0' diff --git a/templates/feed.atom.html b/templates/feed.atom.html index fd2e8dd..267477c 100644 --- a/templates/feed.atom.html +++ b/templates/feed.atom.html @@ -32,7 +32,7 @@ diff --git a/templates/feed.json.html b/templates/feed.json.html index 62775c3..f0355e0 100644 --- a/templates/feed.json.html +++ b/templates/feed.json.html @@ -12,7 +12,7 @@ {% set itemList = [] %} {% for entry in entries %} - {%- set content_html = strings(entry.content).limit(item.options.length).toString()|shortcode|markdown|raw -%} + {%- set content_html = entry.content|shortcode|markdown|raw -%} {%- set post = { "title": entry.title|e, "date_published": entry.published_at|date('Y-m-d\\TH:i:sP'), diff --git a/templates/feed.rss.html b/templates/feed.rss.html index 66c7a94..c5481bd 100644 --- a/templates/feed.rss.html +++ b/templates/feed.rss.html @@ -26,7 +26,7 @@ {{ entry.published_at|date('D, d M Y H:i:s O') }}