Merge branch 'release/4.2.0' into develop

diff --cc CHANGELOG.md
Simple merge

diff --cc client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
index b8e6136fb4ebb4c6822d3e6725bb1451d8d8beca,923f0029bf603fb372849e8f59e769dc5455c319..fd8cd7ffccc19f54dc9d0ae0acb9d5d8e5ac7e35
--- 1/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
--- 2/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
@@@ -3,34 -3,37 +3,36 @@@
  
  .actor {
    display: flex;
 +}
  
 -  my-actor-avatar {
 -    @include margin-right(15px);
 -  }
 +my-actor-avatar {
 +  @include margin-right(15px);
 +}
  
 -  .actor-info {
 -    display: inline-flex;
 -    flex-direction: column;
 +.actor-info {
 +  display: inline-flex;
 +  flex-direction: column;
 +}
  
 -    .actor-info-display-name {
 -      @include peertube-word-wrap;
 +.actor-info-display-name {
++  @include peertube-word-wrap;
+ 
 -      font-size: 20px;
 -      font-weight: $font-bold;
 +  font-size: 20px;
 +  font-weight: $font-bold;
  
 -      @media screen and (max-width: $small-view) {
 -        font-size: 16px;
 -      }
 -    }
 +  @media screen and (max-width: $small-view) {
 +    font-size: 16px;
 +  }
 +}
  
 -    .actor-info-username {
 -      position: relative;
 -      font-size: 14px;
 -      color: pvar(--greyForegroundColor);
 -    }
 +.actor-info-username {
 +  position: relative;
 +  font-size: 14px;
 +  color: pvar(--greyForegroundColor);
 +}
  
 -    .actor-info-followers {
 -      font-size: 15px;
 -      padding-bottom: .5rem;
 -    }
 -  }
 +.actor-info-followers {
 +  padding-bottom: .5rem;
  }
  
  .actor-img-edit-container {

diff --cc server/initializers/constants.ts
Simple merge

diff --cc server/lib/views/shared/video-viewer-counters.ts
index 5876213201109063d311ee84a42a448f3b4ef1a9,5158f8f93f55e0f98480345fbaf8b1791dfd215f..cf3fa5882ee49542ad0d39a5a1349979a11f1966
--- 1/server/lib/views/shared/video-viewer-counters.ts
--- 2/server/lib/views/shared/video-viewer-counters.ts
+++ b/server/lib/views/shared/video-viewer-counters.ts
@@@ -162,10 -162,10 +162,10 @@@ export class VideoViewerCounters 
      return sha256(this.salt + '-' + ip + '-' + videoUUID)
    }
  
 -  private async federateViewerIfNeeded (video: MVideo, viewer: Viewer) {
 +  private async federateViewerIfNeeded (video: MVideoImmutable, viewer: Viewer) {
      // Federate the viewer if it's been a "long" time we did not
      const now = new Date().getTime()
-     const federationLimit = now - (VIEW_LIFETIME.VIEWER_COUNTER / 2)
+     const federationLimit = now - (VIEW_LIFETIME.VIEWER_COUNTER * 0.75)
  
      if (viewer.lastFederation && viewer.lastFederation > federationLimit) return
  

diff --cc server/models/user/user.ts
Simple merge