X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FProtocol.php;h=0ecc076a0fd5501e9b355b175c5b6ca20d30b1b0;hb=cbe435bb708ccf17a4b5bea1e20c3258c9524700;hp=4467bf00271eaba360847818cd7f610a799ebc0b;hpb=7acb4b04343df31c2cc78214fae5429c66d95fb2;p=friendica.git

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 4467bf0027..0ecc076a0f 100644
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -9,31 +9,43 @@ use Friendica\Util\Network;
 /**
  * Manage compatibility with federated networks
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Protocol
 {
-	const DFRN      = 'dfrn';    // Friendica, Mistpark, other DFRN implementations
-	const DIASPORA  = 'dspr';    // Diaspora
-	const DIASPORA2 = 'dspc';    // Diaspora connector
-	const STATUSNET = 'stac';    // Statusnet connector
-	const OSTATUS   = 'stat';    // GNU-social, Pleroma, Mastodon, other OStatus implementations
-	const FEED      = 'feed';    // RSS/Atom feeds with no known "post/notify" protocol
-	const MAIL      = 'mail';    // IMAP/POP
-	const XMPP      = 'xmpp';    // XMPP - Currently unsupported
+	// Native support
+	const ACTIVITYPUB = 'apub';    // ActivityPub (Pleroma, Mastodon, Osada, ...)
+	const DFRN        = 'dfrn';    // Friendica, Mistpark, other DFRN implementations
+	const DIASPORA    = 'dspr';    // Diaspora, Hubzilla, Socialhome, Ganggo
+	const FEED        = 'feed';    // RSS/Atom feeds with no known "post/notify" protocol
+	const MAIL        = 'mail';    // IMAP/POP
+	const OSTATUS     = 'stat';    // GNU Social and other OStatus implementations
+
+	const NATIVE_SUPPORT = [self::DFRN, self::DIASPORA, self::OSTATUS, self::FEED, self::MAIL, self::ACTIVITYPUB];
 
-	const FACEBOOK  = 'face';    // Facebook API
+	const FEDERATED = [self::DFRN, self::DIASPORA, self::OSTATUS, self::ACTIVITYPUB];
+
+	const SUPPORT_PRIVATE = [self::DFRN, self::DIASPORA, self::MAIL, self::ACTIVITYPUB, self::PUMPIO];
+
+	// Supported through a connector
+	const DIASPORA2 = 'dspc';    // Diaspora connector
 	const LINKEDIN  = 'lnkd';    // LinkedIn
-	const MYSPACE   = 'mysp';    // MySpace - Currently unsupported
-	const GPLUS     = 'goog';    // Google+
 	const PUMPIO    = 'pump';    // pump.io
+	const STATUSNET = 'stac';    // Statusnet connector
 	const TWITTER   = 'twit';    // Twitter
+
+	// Dead protocols
 	const APPNET    = 'apdn';    // app.net - Dead protocol
+	const FACEBOOK  = 'face';    // Facebook API - Not working anymore, API is closed
+	const GPLUS     = 'goog';    // Google+ - Dead in 2019
 
-	const NEWS      = 'nntp';    // Network News Transfer Protocol - Currently unsupported
-	const ICALENDAR = 'ical';    // iCalendar - Currently unsupported
-	const PNUT      = 'pnut';    // pnut.io - Currently unsupported
-	const ZOT       = 'zot!';    // Zot! - Currently unsupported
+	// Currently unsupported
+	const ICALENDAR = 'ical';    // iCalendar
+	const MYSPACE   = 'mysp';    // MySpace
+	const NEWS      = 'nntp';    // Network News Transfer Protocol
+	const PNUT      = 'pnut';    // pnut.io
+	const XMPP      = 'xmpp';    // XMPP
+	const ZOT       = 'zot!';    // Zot!
 
 	const PHANTOM   = 'unkn';    // Place holder
 
@@ -42,7 +54,7 @@ class Protocol
 	 *
 	 * @param string $profile_url
 	 * @return string
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public static function getAddrFromProfileUrl($profile_url)
 	{
@@ -61,8 +73,9 @@ class Protocol
 	 * Guesses the network from a profile URL
 	 *
 	 * @param string $profile_url
-	 * @param array  $matches     preg_match return array: [0] => Full match [1] => hostname [2] => username
-	 * @return type
+	 * @param array  $matches preg_match return array: [0] => Full match [1] => hostname [2] => username
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function matchByProfileUrl($profile_url, &$matches = [])
 	{
@@ -102,6 +115,13 @@ class Protocol
 			}
 		}
 
+		// Mastodon, Pleroma
+		if (preg_match('=https?://(.+?)/users/(.+)=ism', $profile_url, $matches)
+			|| preg_match('=https?://(.+?)/@(.+)=ism', $profile_url, $matches)
+		) {
+			return self::ACTIVITYPUB;
+		}
+
 		// pumpio (http://host.name/user)
 		if (preg_match('=https?://([\.\w]+)/([\.\w]+)$=ism', $profile_url, $matches)) {
 			return self::PUMPIO;
@@ -116,6 +136,7 @@ class Protocol
 	 * @param string $profile_url
 	 * @param string $display_name
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function formatMention($profile_url, $display_name)
 	{