Fixed feed-ids

pfefferle · Nov 21, 2018 · ff5c878 · ff5c878
1 parent 7bca30f
commit ff5c878
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 **Donate link:** https://notiz.blog/donate/  
 **Requires at least:** 4.5  
 **Tested up to:** 4.9.9  
-**Stable tag:** 2.5.0  
+**Stable tag:** 2.5.1  
 **License:** MIT  
 **License URI:** https://opensource.org/licenses/MIT  
 
@@ -35,7 +35,12 @@ Compatibility:
 	* [x] Share Mastodon-comments
 	* [ ] Share blog-comments
 * Friendica
-	* not tested yet
+	* [x] Follow blog
+	* [ ] Follow Mastodon
+	* [x] Share blog-posts
+	* [ ] Share Mastodon-posts
+	* [x] Share Friendica-comments
+	* [ ] Share blog-comments
 
 Plugin requirements:
 
@@ -63,6 +68,10 @@ If you are the author of a relevant plugin, or are planning one, contact us to g
 
 ## Changelog ##
 
+### 2.5.1 ###
+
+* Fixed feed-ids
+
 ### 2.5.0 ###
 
 * fixed "flush rewrite rules"

diff --git a/languages/ostatus-for-wordpress.pot b/languages/ostatus-for-wordpress.pot
@@ -2,10 +2,10 @@
 # This file is distributed under the MIT.
 msgid ""
 msgstr ""
-"Project-Id-Version: OStatus 2.5.0\n"
+"Project-Id-Version: OStatus 2.5.1\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/wordpress-ostatus\n"
-"POT-Creation-Date: 2018-10-09 21:29:36+00:00\n"
+"POT-Creation-Date: 2018-11-21 06:58:20+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Comments for %s"
 msgstr ""
 
-#: templates/feed-ostatus-comments.php:90
+#: templates/feed-ostatus-comments.php:88
 #. translators: Individual comment title. 1: Post title, 2: Comment author name
 msgid "Comment on %1$s by %2$s"
 msgstr ""
 
-#: templates/feed-ostatus-comments.php:93
+#: templates/feed-ostatus-comments.php:91
 #. translators: Comment author title. 1: Comment author name
 msgid "By: %s"
 msgstr ""

diff --git a/ostatus-for-wordpress.php b/ostatus-for-wordpress.php
@@ -7,7 +7,7 @@
  * Author URI: https://notiz.blog/
  * License: MIT
  * License URI: http://opensource.org/licenses/MIT
- * Version: 2.5.0
+ * Version: 2.5.1
  * Text Domain: ostatus-for-wordpress
  * Domain Path: /languages
  */

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: ostatus, federated, mastodon, social, gnusocial, statusnet
 Donate link: https://notiz.blog/donate/
 Requires at least: 4.5
 Tested up to: 4.9.9
-Stable tag: 2.5.0
+Stable tag: 2.5.1
 License: MIT
 License URI: https://opensource.org/licenses/MIT
 
@@ -35,7 +35,12 @@ Compatibility:
 	* [x] Share Mastodon-comments
 	* [ ] Share blog-comments
 * Friendica
-	* not tested yet
+	* [x] Follow blog
+	* [ ] Follow Mastodon
+	* [x] Share blog-posts
+	* [ ] Share Mastodon-posts
+	* [x] Share Friendica-comments
+	* [ ] Share blog-comments
 
 Plugin requirements:
 
@@ -63,6 +68,10 @@ If you are the author of a relevant plugin, or are planning one, contact us to g
 
 == Changelog ==
 
+= 2.5.1 =
+
+* Fixed feed-ids
+
 = 2.5.0 =
 
 * fixed "flush rewrite rules"

diff --git a/templates/feed-ostatus-comments.php b/templates/feed-ostatus-comments.php
@@ -45,20 +45,18 @@
 	</title>
 	<subtitle type="text"><?php bloginfo_rss( 'description' ); ?></subtitle>
 
-	<updated>
-	<?php
+	<updated><?php
 		$date = get_lastcommentmodified( 'GMT' );
 		echo $date ? mysql2date( 'Y-m-d\TH:i:s\Z', $date, false ) : date( 'Y-m-d\TH:i:s\Z' );
-	?>
-	</updated>
+	?></updated>
 
 <?php if ( is_singular() ) { ?>
 	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php comments_link_feed(); ?>" />
 	<link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link( '', 'atom' ) ); ?>" />
-	<id><?php echo esc_url( get_post_comments_feed_link( '', 'atom' ) ); ?></id>
+	<id><?php echo esc_url( get_post_comments_feed_link( '', 'ostatus' ) ); ?></id>
 <?php } elseif ( is_search() ) { ?>
 	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />
-	<link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link( '', 'atom' ); ?>" />
+	<link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link( '', 'ostatus' ); ?>" />
 	<id><?php echo get_search_comments_feed_link( '', 'atom' ); ?></id>
 <?php } else { ?>
 	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php bloginfo_rss( 'url' ); ?>" />

diff --git a/templates/feed-ostatus.php b/templates/feed-ostatus.php
@@ -33,15 +33,13 @@
 	<title type="text"><?php wp_title_rss(); ?></title>
 	<subtitle type="text"><?php bloginfo_rss( 'description' ); ?></subtitle>
 
-	<updated>
-	<?php
+	<updated><?php
 		$date = get_lastpostmodified( 'GMT' );
 		echo $date ? mysql2date( 'Y-m-d\TH:i:s\Z', $date, false ) : date( 'Y-m-d\TH:i:s\Z' );
-	?>
-	</updated>
+	?></updated>
 
 	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php bloginfo_rss( 'url' ); ?>" />
-	<id><?php bloginfo( 'atom_url' ); ?></id>
+	<id><?php self_link(); ?></id>
 	<link rel="self" type="application/atom+xml" href="<?php self_link(); ?>" />
 
 	<?php if ( is_author() ) : ?>