mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-11-03 23:14:13 +00:00 
			
		
		
		
	fix exception handling for Like activities
This commit is contained in:
		
							parent
							
								
									dff465000c
								
							
						
					
					
						commit
						8f42e8434e
					
				
					 1 changed files with 7 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -31,6 +31,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js';
 | 
			
		|||
import { AbuseReportService } from '@/core/AbuseReportService.js';
 | 
			
		||||
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 | 
			
		||||
import { fromTuple } from '@/misc/from-tuple.js';
 | 
			
		||||
import { IdentifiableError } from '@/misc/identifiable-error.js';
 | 
			
		||||
import { getApHrefNullable, getApId, getApIds, getApType, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
 | 
			
		||||
import { ApNoteService } from './models/ApNoteService.js';
 | 
			
		||||
import { ApLoggerService } from './ApLoggerService.js';
 | 
			
		||||
| 
						 | 
				
			
			@ -204,13 +205,16 @@ export class ApInboxService {
 | 
			
		|||
 | 
			
		||||
		await this.apNoteService.extractEmojis(activity.tag ?? [], actor.host).catch(() => null);
 | 
			
		||||
 | 
			
		||||
		return await this.reactionService.create(actor, note, activity._misskey_reaction ?? activity.content ?? activity.name).catch(err => {
 | 
			
		||||
			if (err.id === '51c42bb4-931a-456b-bff7-e5a8a70dd298') {
 | 
			
		||||
		try {
 | 
			
		||||
			await this.reactionService.create(actor, note, activity._misskey_reaction ?? activity.content ?? activity.name);
 | 
			
		||||
			return 'ok';
 | 
			
		||||
		} catch (err) {
 | 
			
		||||
			if (err instanceof IdentifiableError && err.id === '51c42bb4-931a-456b-bff7-e5a8a70dd298') {
 | 
			
		||||
				return 'skip: already reacted';
 | 
			
		||||
			} else {
 | 
			
		||||
				throw err;
 | 
			
		||||
			}
 | 
			
		||||
		}).then(() => 'ok');
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	@bindThis
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue