Fix #245

grishka · grishka · commit 8f7cd7b170f9 · 2026-01-23T00:30:09.000+03:00
diff --git a/src/main/java/smithereen/routes/ActivityPubRoutes.java b/src/main/java/smithereen/routes/ActivityPubRoutes.java
@@ -904,7 +904,13 @@ else if(o!=null)
 		}
 		if(fa.needUpdate() && canUpdate){
 			try{
+				Actor oldActor=actor;
 				actor=ctx.getObjectLinkResolver().resolve(activity.actor.link, Actor.class, true, true, true);
+
+				// Temporary fix until https://codeberg.org/superseriousbusiness/gotosocial/issues/4565 gets released and everyone updates to that version.
+				// Somehow, Application objects could end up interpreted as users in some previous Smithereen version.
+				if(actor instanceof ActivityPubApplication && oldActor instanceof ForeignUser fu)
+					actor=ctx.getUsersController().getUserOrThrow(fu.id);
 			}catch(ObjectNotFoundException x){
 				LOG.debug("Exception while refreshing remote actor {}", activity.actor.link, x);
 			}

Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,13 @@ else if(o!=null)`
`904`	`904`	`}`
`905`	`905`	`if(fa.needUpdate() && canUpdate){`
`906`	`906`	`try{`
	`907`	`+ Actor oldActor=actor;`
`907`	`908`	`actor=ctx.getObjectLinkResolver().resolve(activity.actor.link, Actor.class, true, true, true);`
	`909`	`+`
	`910`	`+ // Temporary fix until https://codeberg.org/superseriousbusiness/gotosocial/issues/4565 gets released and everyone updates to that version.`
	`911`	`+ // Somehow, Application objects could end up interpreted as users in some previous Smithereen version.`
	`912`	`+ if(actor instanceof ActivityPubApplication && oldActor instanceof ForeignUser fu)`
	`913`	`+ actor=ctx.getUsersController().getUserOrThrow(fu.id);`
`908`	`914`	`}catch(ObjectNotFoundException x){`
`909`	`915`	`LOG.debug("Exception while refreshing remote actor {}", activity.actor.link, x);`
`910`	`916`	`}`