X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=bb20c2d83f2bca1ce15aeb862b09468384a38ea9;hb=b65de1be4dcf626c552be613d531d3f6e23c6085;hp=3cec6d7392ef459b4ccb50d66946c2ffc2120843;hpb=c27463a603186b623500b03c6a56b330a6568350;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 3cec6d739..bb20c2d83 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,15 +1,14 @@
 import 'focus-visible'
+import { tap } from 'rxjs/operators'
 import { environment } from 'src/environments/environment'
 import { APP_BASE_HREF, registerLocaleData } from '@angular/common'
-import { NgModule } from '@angular/core'
+import { APP_INITIALIZER, NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { ServiceWorkerModule } from '@angular/service-worker'
-import { ServerService } from '@app/core'
 import localeOc from '@app/helpers/locales/oc'
-import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
-import { CoreModule } from './core'
+import { CoreModule, PluginService, ServerService } from './core'
 import { EmptyComponent } from './empty.component'
 import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
 import { HighlightPipe } from './header/highlight.pipe'
@@ -18,16 +17,27 @@ import { ConfirmComponent } from './modal/confirm.component'
 import { CustomModalComponent } from './modal/custom-modal.component'
 import { InstanceConfigWarningModalComponent } from './modal/instance-config-warning-modal.component'
 import { QuickSettingsModalComponent } from './modal/quick-settings-modal.component'
-import { WelcomeModalComponent } from './modal/welcome-modal.component'
+import { AdminWelcomeModalComponent } from './modal/admin-welcome-modal.component'
+import { AccountSetupWarningModalComponent } from './modal/account-setup-warning-modal.component'
+import { SharedActorImageModule } from './shared/shared-actor-image/shared-actor-image.module'
 import { SharedFormModule } from './shared/shared-forms'
 import { SharedGlobalIconModule } from './shared/shared-icons'
 import { SharedInstanceModule } from './shared/shared-instance'
 import { SharedMainModule } from './shared/shared-main'
 import { SharedUserInterfaceSettingsModule } from './shared/shared-user-settings'
-import { SharedActorImageModule } from './shared/shared-actor-image/shared-actor-image.module'
 
 registerLocaleData(localeOc, 'oc')
 
+export function loadConfigFactory (server: ServerService, pluginService: PluginService) {
+  return () => {
+    const result = server.loadHTMLConfig()
+
+    if (result) return result.pipe(tap(() => pluginService.initializePlugins()))
+
+    return pluginService.initializePlugins()
+  }
+}
+
 @NgModule({
   bootstrap: [ AppComponent ],
 
@@ -44,8 +54,9 @@ registerLocaleData(localeOc, 'oc')
     SuggestionComponent,
     HighlightPipe,
 
+    AccountSetupWarningModalComponent,
     CustomModalComponent,
-    WelcomeModalComponent,
+    AdminWelcomeModalComponent,
     InstanceConfigWarningModalComponent,
     ConfirmComponent
   ],
@@ -62,22 +73,6 @@ registerLocaleData(localeOc, 'oc')
     SharedInstanceModule,
     SharedActorImageModule,
 
-    MetaModule.forRoot({
-      provide: MetaLoader,
-      useFactory: (serverService: ServerService) => {
-        return new MetaStaticLoader({
-          pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
-          pageTitleSeparator: ' - ',
-          get applicationName () { return serverService.getTmpConfig().instance.name },
-          defaults: {
-            get title () { return serverService.getTmpConfig().instance.name },
-            get description () { return serverService.getTmpConfig().instance.shortDescription }
-          }
-        })
-      },
-      deps: [ ServerService ]
-    }),
-
     AppRoutingModule // Put it after all the module because it has the 404 route
   ],
 
@@ -85,6 +80,12 @@ registerLocaleData(localeOc, 'oc')
     {
       provide: APP_BASE_HREF,
       useValue: '/'
+    },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: loadConfigFactory,
+      deps: [ ServerService, PluginService ],
+      multi: true
     }
   ]
 })