3 files changed, 11 insertions, 8 deletions

diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index 312451abe..44be0fd3c 100644
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -411,8 +411,6 @@ export class AccountModel extends Model {
       id: this.id,
       displayName: this.getDisplayName(),
       description: this.description,
-      createdAt: this.createdAt,
-      updatedAt: this.updatedAt,
       userId: this.userId ? this.userId : undefined
     }
 
diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts
index 19f3f7e04..396a52337 100644
--- a/server/models/activitypub/actor.ts
+++ b/server/models/activitypub/actor.ts
@@ -69,9 +69,7 @@ export const unusedActorAttributesForAPI = [
   'outboxUrl',
   'sharedInboxUrl',
   'followersUrl',
-  'followingUrl',
-  'createdAt',
-  'updatedAt'
+  'followingUrl'
 ]
 
 @DefaultScope(() => ({
@@ -222,6 +220,10 @@ export class ActorModel extends Model {
   @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACTORS.URL.max))
   followingUrl: string
 
+  @AllowNull(true)
+  @Column
+  remoteCreatedAt: Date
+
   @CreatedAt
   createdAt: Date
 
@@ -555,7 +557,7 @@ export class ActorModel extends Model {
       followingCount: this.followingCount,
       followersCount: this.followersCount,
       banner,
-      createdAt: this.createdAt,
+      createdAt: this.getCreatedAt(),
       updatedAt: this.updatedAt
     })
   }
@@ -608,6 +610,7 @@ export class ActorModel extends Model {
         owner: this.url,
         publicKeyPem: this.publicKey
       },
+      published: this.getCreatedAt().toISOString(),
       icon,
       image
     }
@@ -690,4 +693,8 @@ export class ActorModel extends Model {
 
     return isOutdated(this, ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL)
   }
+
+  getCreatedAt (this: MActorAPChannel | MActorAPAccount | MActorFormattable) {
+    return this.remoteCreatedAt || this.createdAt
+  }
 }
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts
index b7ffbd3b1..b627595c9 100644
--- a/server/models/video/video-channel.ts
+++ b/server/models/video/video-channel.ts
@@ -653,8 +653,6 @@ ON              "Account->Actor"."serverId" = "Account->Actor->Server"."id"`
       description: this.description,
       support: this.support,
       isLocal: this.Actor.isOwned(),
-      createdAt: this.createdAt,
-      updatedAt: this.updatedAt,
       ownerAccount: undefined,
       videosCount,
       viewsPerDay