Remove parameter-less call of OStatus\Salmon module in DFRN\Notify
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1342615279
This commit is contained in:
		
					parent
					
						
							
								a71fb8d7f3
							
						
					
				
			
			
				commit
				
					
						71a7f2d503
					
				
			
		
					 2 changed files with 7 additions and 16 deletions
				
			
		| 
						 | 
				
			
			@ -70,18 +70,8 @@ class Notify extends BaseModule
 | 
			
		|||
				throw new \Friendica\Network\HTTPException\InternalServerErrorException();
 | 
			
		||||
			}
 | 
			
		||||
			$this->dispatchPrivate($user, $postdata);
 | 
			
		||||
		} elseif (!$this->dispatchPublic($postdata)) {
 | 
			
		||||
			(new Salmon(
 | 
			
		||||
				$this->database,
 | 
			
		||||
				$this->l10n,
 | 
			
		||||
				$this->baseUrl,
 | 
			
		||||
				$this->args,
 | 
			
		||||
				$this->logger,
 | 
			
		||||
				$this->profiler,
 | 
			
		||||
				$this->response,
 | 
			
		||||
				$this->server,
 | 
			
		||||
				$this->parameters
 | 
			
		||||
			))->rawContent($request);
 | 
			
		||||
		} else {
 | 
			
		||||
			$this->dispatchPublic($postdata);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -66,11 +66,12 @@ class Salmon extends \Friendica\BaseModule
 | 
			
		|||
	{
 | 
			
		||||
		$xml = Network::postdata();
 | 
			
		||||
 | 
			
		||||
		$this->logger->debug('New Salmon', ['nickname' => $this->parameters['nickname'], 'xml' => $xml]);
 | 
			
		||||
 | 
			
		||||
		// Despite having a route with a mandatory nickname parameter, this method can also be called from
 | 
			
		||||
		// \Friendica\Module\DFRN\Notify->post where the same parameter is optional 🤷
 | 
			
		||||
		$nickname = $this->parameters['nickname'] ?? '';
 | 
			
		||||
		if (empty($nickname)) {
 | 
			
		||||
			throw new HTTPException\BadRequestException('nickname parameter is mandatory');
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		$this->logger->debug('New Salmon', ['nickname' => $nickname, 'xml' => $xml]);
 | 
			
		||||
 | 
			
		||||
		$importer = $this->database->selectFirst('user', [], ['nickname' => $nickname, 'account_expired' => false, 'account_removed' => false]);
 | 
			
		||||
		if (!$this->database->isResult($importer)) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue