Merge pull request #153 from dshanske/posttypes

Enhance Post Types

Author: pfefferle

README.md

@@ -69,7 +69,9 @@ The Webmention and Pingback logos are made by [Aaron Parecki](http://aaronpareck
 Project actively developed on Github at [pfefferle/wordpress-semantic-linkbacks](https://github.com/pfefferle/wordpress-semantic-linkbacks). Please file support issues there.
 
 ### 3.7.4 ###
+
 * Replace `rsvp-invite` property which is not in use with `invite` property and add unit tests
+* Enhance post type returns to include post, page, and sitename
 * Add basic person tagging support
 
 ### 3.7.3 ###

includes/class-linkbacks-handler.php

@@ -256,15 +256,17 @@ public static function get_comment_type_strings() {
 	}
 
 	/**
-	* Returns an array of post formats (with articlex)
+	* Returns an array of post types (with articles)
 	*
 	* @return array The array of translated comment type names.
 	*/
-	public static function get_post_format_strings() {
+	public static function get_post_type_strings() {
 		$strings = array(
-			// Special case. any value that evals to false will be considered standard
+			// Generic Post Types
+			'post'     => __( 'this Post', 'semantic-linkbacks' ),
+			'page'     => __( 'this Page', 'semantic-linkbacks' ),
+			// Post Format Types
 			'standard' => __( 'this Article', 'semantic-linkbacks' ),
-
 			'aside'    => __( 'this Aside', 'semantic-linkbacks' ),
 			'chat'     => __( 'this Chat', 'semantic-linkbacks' ),
 			'gallery'  => __( 'this Gallery', 'semantic-linkbacks' ),
@@ -409,6 +411,38 @@ public static function comment_text_add_cite( $text, $comment = null, $args = ar
 		return $text . sprintf( $cite, $url, $host );
 	}
 
+	/**
+	 * Returns a post type that is used to generate text. This can be from post formats/kinds/post type/etc
+	 *
+	 * @param int $post_id Post ID
+	 *
+	 * @return string the post type
+	 */
+	public static function get_post_type( $post_id ) {
+		$post_typestrings = self::get_post_type_strings();
+		$post_type = $post_typestrings[ 'post' ];
+		
+		// If this is the page homepages are redirected to then use the site name
+		if ( $post_id === get_option( 'webmention_home_mentions', 0 ) ) {
+			$post_type = get_bloginfo( 'name' );
+		} else if ( 'page' === get_post_type( $post_id ) ) {
+			$post_type = $post_typestrings[ 'page' ];
+		} else if ( current_theme_supports( 'post-formats' ) ) {
+			$post_format = get_post_format( $post_id );
+			
+			// add "standard" as default for post format enabled types
+			if ( ! $post_format || ! in_array( $post_format, array_keys( $post_typestrings ), true ) ) {
+				$post_format = 'standard';
+			}
+			
+			$post_type = $post_typestrings[ $post_format ];
+		}
+
+		return apply_filters( 'semantic_linkbacks_post_type', $post_type, $post_id );
+	}
+
+
+
 	/**
 	 * Generate excerpt for all types except "reply"
 	 *
@@ -441,21 +475,7 @@ public static function comment_text_excerpt( $text, $comment = null, $args = arr
 			$semantic_linkbacks_type = 'mention';
 		}
 
-		if ( ! current_theme_supports( 'post-formats' ) ) {
-			$post_format = 'standard';
-		} else {
-			$post_format = get_post_format( $comment->comment_post_ID );
-			// add "standard" as default
-			if ( ! $post_format || ! in_array( $post_format, array_keys( self::get_post_format_strings() ), true ) ) {
-				$post_format = 'standard';
-			}
-		}
-
-		// get post type
-		$post_formatstrings = self::get_post_format_strings();
-		$post_type          = $post_formatstrings[ $post_format ];
-
-		$post_type = apply_filters( 'semantic_linkbacks_post_type', $post_type, $comment->comment_post_ID );
+		$post_type = self::get_post_type( $comment->comment_post_ID );
 
 		// get all the excerpts
 		$comment_type_excerpts = self::get_comment_type_excerpts();

readme.txt

@@ -69,7 +69,9 @@ The Webmention and Pingback logos are made by [Aaron Parecki](http://aaronpareck
 Project actively developed on Github at [pfefferle/wordpress-semantic-linkbacks](https://github.com/pfefferle/wordpress-semantic-linkbacks). Please file support issues there.
 
 = 3.7.4 =
+
 * Replace `rsvp-invite` property which is not in use with `invite` property and add unit tests
+* Enhance post type returns to include post, page, and sitename
 * Add basic person tagging support
 
 = 3.7.3 =