X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FProtocol.php;h=0038b505a570b4f73f3cb48837a8cf049698b784;hb=9c12f3f226cefa64456c559fd060e067389d9886;hp=9e96b7db2f604e2d90b8c1c2a51eaf6c0bb3db8c;hpb=804cfa03200456116db0c96b7f2ae6e3b7bdbfd8;p=friendica.git

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 9e96b7db2f..0038b505a5 100644
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -9,30 +9,32 @@ use Friendica\Util\Network;
 /**
  * Manage compatibility with federated networks
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Protocol
 {
 	// Native support
-	const ACTIVITYPUB = 'apub';    // ActivityPub
+	const ACTIVITYPUB = 'apub';    // ActivityPub (Pleroma, Mastodon, Osada, ...)
 	const DFRN        = 'dfrn';    // Friendica, Mistpark, other DFRN implementations
-	const DIASPORA    = 'dspr';    // Diaspora
+	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, Pleroma, Mastodon, other OStatus implementations
+	const OSTATUS     = 'stat';    // GNU Social and other OStatus implementations
 
 	const NATIVE_SUPPORT = [self::DFRN, self::DIASPORA, self::OSTATUS, self::FEED, self::MAIL, self::ACTIVITYPUB];
 
 	// Supported through a connector
-	const APPNET    = 'apdn';    // app.net - Dead protocol
 	const DIASPORA2 = 'dspc';    // Diaspora connector
-	const FACEBOOK  = 'face';    // Facebook API
-	const GPLUS     = 'goog';    // Google+
 	const LINKEDIN  = 'lnkd';    // LinkedIn
 	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
+
 	// Currently unsupported
 	const ICALENDAR = 'ical';    // iCalendar
 	const MYSPACE   = 'mysp';    // MySpace
@@ -48,7 +50,7 @@ class Protocol
 	 *
 	 * @param string $profile_url
 	 * @return string
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public static function getAddrFromProfileUrl($profile_url)
 	{
@@ -67,8 +69,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 = [])
 	{
@@ -108,6 +111,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;
@@ -122,6 +132,7 @@ class Protocol
 	 * @param string $profile_url
 	 * @param string $display_name
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function formatMention($profile_url, $display_name)
 	{