Browse Source

Update AP helpers

Daniel Supernault 2 years ago
parent
commit
43c93e74e7
1 changed files with 2 additions and 2 deletions
  1. 2 2
      app/Util/ActivityPub/Helpers.php

+ 2 - 2
app/Util/ActivityPub/Helpers.php

@@ -453,7 +453,7 @@ class Helpers {
 	public static function storeStatus($url, $profile, $activity)
 	public static function storeStatus($url, $profile, $activity)
 	{
 	{
 		$id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($activity['url']);
 		$id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($activity['url']);
-		$url = isset($activity['url']) && is_string($activity['url']) ? $activity['url'] : $id;
+		$url = isset($activity['url']) && is_string($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id);
 		$idDomain = parse_url($id, PHP_URL_HOST);
 		$idDomain = parse_url($id, PHP_URL_HOST);
 		$urlDomain = parse_url($url, PHP_URL_HOST);
 		$urlDomain = parse_url($url, PHP_URL_HOST);
 		if(!self::validateUrl($id) || !self::validateUrl($url)) {
 		if(!self::validateUrl($id) || !self::validateUrl($url)) {
@@ -556,7 +556,7 @@ class Helpers {
 	{
 	{
 		$id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url);
 		$id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url);
 		$url = isset($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id);
 		$url = isset($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id);
-		$urlDomain = parse_url($url, PHP_URL_HOST);
+		$urlDomain = parse_url(self::pluckval($url), PHP_URL_HOST);
 		$scope = 'private';
 		$scope = 'private';
 
 
 		if(isset($activity['to']) == true) {
 		if(isset($activity['to']) == true) {