6 files changed, 43 insertions, 7 deletions

diff --git a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts
index da8c7298f..ad9368794 100644
--- a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts
+++ b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.ts
@@ -99,7 +99,7 @@ export class MyAccountVideoChannelsComponent implements OnInit {
     }
   }
 
-  resetSearch() {
+  resetSearch () {
     this.channelsSearch = ''
     this.onChannelsSearchChanged()
   }
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
index 8de152b5e..a60ed885d 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
@@ -5,7 +5,7 @@
     Notification preferences
   </a>
 
-  <div class="peertube-select-container peertube-select-button ml-2">
+  <div class="peertube-select-container peertube-select-button ml-2 mr-2">
     <select [(ngModel)]="notificationSortType" (ngModelChange)="onChangeSortColumn()" class="form-control">
       <option value="undefined" disabled>Sort by</option>
       <option value="createdAt" i18n>Newest first</option>
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
index d586eeb0d..035fa2b27 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss
@@ -32,8 +32,40 @@ my-user-notifications {
   .header {
     flex-direction: column;
 
-    & >:first-child {
+    & >:first-child, .peertube-select-container {
       margin-bottom: 15px;
     }
+
+    .peertube-select-container {
+      margin-left: 0 !important;
+    }
+  }
+}
+
+@media screen and (min-width: $mobile-view) and (max-width: $small-view) {
+  .header {
+    a {
+      font-size: 0;
+      padding: 0 13px;
+    }
+
+    .peertube-select-container {
+      width: auto !important;
+    }
+  }
+}
+
+@media screen and (min-width: $mobile-view) and (max-width: #{$small-view + $menu-width}) {
+  :host-context(.main-col:not(.expanded)) {
+    .header {
+      a {
+        font-size: 0;
+        padding: 0 13px;
+      }
+
+      .peertube-select-container {
+        width: auto !important;
+      }
+    }
   }
 }
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index ea89ca9ce..be510c08f 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -371,7 +371,7 @@ table {
       input[type=email],
       textarea,
       .peertube-select-container {
-        width: 100% !important;
+        flex-grow: 1;
       }
 
       .caption input[type=text] {
diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts
index d207a19ae..8b88feaf3 100644
--- a/server/controllers/api/users/my-subscriptions.ts
+++ b/server/controllers/api/users/my-subscriptions.ts
@@ -13,7 +13,12 @@ import {
   userSubscriptionAddValidator,
   userSubscriptionGetValidator
 } from '../../../middlewares'
-import { areSubscriptionsExistValidator, userSubscriptionsSortValidator, videosSortValidator, userSubscriptionListValidator } from '../../../middlewares/validators'
+import {
+  areSubscriptionsExistValidator,
+  userSubscriptionsSortValidator,
+  videosSortValidator,
+  userSubscriptionListValidator
+} from '../../../middlewares/validators'
 import { VideoModel } from '../../../models/video/video'
 import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils'
 import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts
index 529cb35cc..10c13304f 100644
--- a/server/models/activitypub/actor-follow.ts
+++ b/server/models/activitypub/actor-follow.ts
@@ -15,8 +15,7 @@ import {
   Max,
   Model,
   Table,
-  UpdatedAt,
-  Sequelize
+  UpdatedAt
 } from 'sequelize-typescript'
 import { FollowState } from '../../../shared/models/actors'
 import { ActorFollow } from '../../../shared/models/actors/follow.model'