Improved message handling / new activity relay handling
This commit is contained in:
		
					parent
					
						
							
								7834359957
							
						
					
				
			
			
				commit
				
					
						86105635ca
					
				
			
		
					 26 changed files with 280 additions and 428 deletions
				
			
		|  | @ -115,7 +115,7 @@ class Cron | |||
| 
 | ||||
| 			Worker::add(PRIORITY_LOW, 'ExpirePosts'); | ||||
| 
 | ||||
| 			Worker::add(PRIORITY_LOW, 'ExpireConversations'); | ||||
| 			Worker::add(PRIORITY_LOW, 'ExpireActivities'); | ||||
| 
 | ||||
| 			Worker::add(PRIORITY_LOW, 'RemoveUnusedTags'); | ||||
| 
 | ||||
|  |  | |||
|  | @ -22,21 +22,15 @@ | |||
| namespace Friendica\Worker; | ||||
| 
 | ||||
| use Friendica\Database\DBA; | ||||
| use Friendica\DI; | ||||
| use Friendica\Util\DateTimeFormat; | ||||
| 
 | ||||
| class ExpireConversations | ||||
| class ExpireActivities | ||||
| { | ||||
| 	/** | ||||
| 	 * Delete old conversation entries | ||||
| 	 * Delete old post-activity entries | ||||
| 	 */ | ||||
| 	public static function execute() | ||||
| 	{ | ||||
| 		$days = intval(DI::config()->get('system', 'dbclean_expire_conversation', 90)); | ||||
| 		if (empty($days)) { | ||||
| 			return; | ||||
| 		} | ||||
| 
 | ||||
| 		DBA::delete('conversation', ["`received` < ?", DateTimeFormat::utc('now - ' . $days . ' days')]); | ||||
| 		DBA::delete('post-activity', ["`received` < ?", DateTimeFormat::utc('now - 7 days')]); | ||||
| 	} | ||||
| } | ||||
|  | @ -746,7 +746,7 @@ class Notifier | |||
| 			} | ||||
| 
 | ||||
| 			Logger::info('Origin item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.'); | ||||
| 		} elseif (!DBA::exists('conversation', ['item-uri' => $target_item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB])) { | ||||
| 		} elseif (!Post\Activity::exists($target_item['uri-id'])) { | ||||
| 			Logger::info('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.'); | ||||
| 			return ['count' => 0, 'contacts' => []]; | ||||
| 		} elseif ($parent['origin']) { | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue