summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2024-11-14 20:32:59 -0500
committerHazelnoot <acomputerdog@gmail.com>2024-11-20 22:02:59 -0500
commitfedf0d7e20e615485b79b393e597ed2619577df0 (patch)
tree7b3a25ea96b76c582138d1311ba67fc2d35404ec
parentreduce log spam from `updateFeatured` (diff)
downloadsharkey-fedf0d7e20e615485b79b393e597ed2619577df0.tar.gz
sharkey-fedf0d7e20e615485b79b393e597ed2619577df0.tar.bz2
sharkey-fedf0d7e20e615485b79b393e597ed2619577df0.zip
further reduce log spam from `updateFeatured` errors
-rw-r--r--packages/backend/src/core/activitypub/models/ApPersonService.ts26
1 files changed, 11 insertions, 15 deletions
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index d2f5b64119..6754c6c41b 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -483,13 +483,7 @@ export class ApPersonService implements OnModuleInit {
}
//#endregion
- await this.updateFeatured(user.id, resolver).catch(err => {
- if (err instanceof AbortError || (err instanceof StatusError && err.isRetryable)) {
- this.logger.warn(`Failed to update featured notes: ${err.name}: ${err.message}`);
- } else {
- this.logger.error('Failed to update featured notes:', err);
- }
- });
+ await this.updateFeatured(user.id, resolver).catch(err => console.error(err));
return user;
}
@@ -654,13 +648,7 @@ export class ApPersonService implements OnModuleInit {
{ followerSharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox },
);
- await this.updateFeatured(exist.id, resolver).catch(err => {
- if (err instanceof AbortError || (err instanceof StatusError && err.isRetryable)) {
- this.logger.warn(`Failed to update featured notes: ${err.name}: ${err.message}`);
- } else {
- this.logger.error('Failed to update featured notes:', err);
- }
- });
+ await this.updateFeatured(exist.id, resolver).catch(err => console.error(err));
const updated = { ...exist, ...updates };
@@ -735,7 +723,15 @@ export class ApPersonService implements OnModuleInit {
const _resolver = resolver ?? this.apResolverService.createResolver();
// Resolve to (Ordered)Collection Object
- const collection = await _resolver.resolveCollection(user.featured);
+ const collection = await _resolver.resolveCollection(user.featured).catch(err => {
+ if (err instanceof AbortError || err instanceof StatusError) {
+ this.logger.warn(`Failed to update featured notes: ${err.name}: ${err.message}`);
+ } else {
+ this.logger.error('Failed to update featured notes:', err);
+ }
+ });
+ if (!collection) return;
+
if (!isCollectionOrOrderedCollection(collection)) throw new Error('Object is not Collection or OrderedCollection');
// Resolve to Object(may be Note) arrays