added new plugins to AdmService and extended logic of notification

Author: Hidanio

src/main/kotlin/com/vk/admstorm/AdmService.kt

@@ -16,7 +16,9 @@ import com.vk.admstorm.utils.extensions.unquote
 class AdmService(private var myProject: Project) {
     companion object {
         private val LOG = logger<AdmService>()
-        val PLUGIN_ID = PluginId.getId("com.vk.admstorm")
+        val ADM_PLUGIN_ID = PluginId.getId("com.vk.admstorm")
+        val KPHPSTORM_PLUGIN_ID = PluginId.getId("com.vk.kphpstorm")
+        val MODULITE_PLUGIN_ID = PluginId.getId("com.vk.modulite")
 
         fun getInstance(project: Project) = project.service<AdmService>()
     }

src/main/kotlin/com/vk/admstorm/AdmStartupService.kt

@@ -139,7 +139,7 @@ class AdmStartupService(private var project: Project) {
     }
 
     private fun showWelcomeMessage() {
-        val plugin = PluginManagerCore.getPlugin(AdmService.PLUGIN_ID) ?: return
+        val plugin = PluginManagerCore.getPlugin(AdmService.ADM_PLUGIN_ID) ?: return
         RunOnceUtil.runOnceForApp("com.vk.admstorm.welcome.test.message.${plugin.version}") {
             AdmNotification(
                 """

src/main/kotlin/com/vk/admstorm/AdmStormStartupActivity.kt

@@ -5,6 +5,7 @@ import com.intellij.ide.plugins.InstalledPluginsState
 import com.intellij.openapi.application.invokeLater
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.logger
+import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.fileTypes.ex.FileTypeChooser
 import com.intellij.openapi.fileTypes.impl.AbstractFileType
 import com.intellij.openapi.options.ShowSettingsUtil
@@ -67,26 +68,36 @@ class AdmStormStartupActivity : ProjectActivity {
         Logger.setFactory(AdmStormLoggerFactory(sentry, defaultLoggerFactory))
     }
 
+    private fun hasNewVersion(pluginId : PluginId): Boolean {
+        return InstalledPluginsState.getInstance().hasNewerVersion(pluginId)
+    }
+
     private fun checkUpdates(project: Project) {
-        val hasNewerVersion = InstalledPluginsState.getInstance().hasNewerVersion(AdmService.PLUGIN_ID)
-        if (!hasNewerVersion) {
+        val hasAdmNewerVersion = hasNewVersion(AdmService.ADM_PLUGIN_ID)
+        val hasKphpStormNewVersion = hasNewVersion(AdmService.KPHPSTORM_PLUGIN_ID)
+        val hasModuliteNewVersion = hasNewVersion(AdmService.MODULITE_PLUGIN_ID)
+
+        if (!(hasAdmNewerVersion && hasModuliteNewVersion && hasKphpStormNewVersion)) {
             return
         }
 
-        AdmNotification("New version of the plugin is available")
+        var updateNotification = AdmNotification("New version of the plugin is available")
             .withActions(
                 AdmNotification.Action("Update") { _, _ ->
                     invokeLater {
                         ShowSettingsUtil.getInstance().showSettingsDialog(project, "Plugins")
                     }
                 }
             )
-            .withActions(
+
+        if (hasAdmNewerVersion) {
+            updateNotification = updateNotification.withActions(
                 AdmNotification.Action("What's new") { _, _ ->
                     val url = "https://vkcom.github.io/admstorm/whatsnew.html?server_name=${ServerNameProvider.name()}"
                     BrowserUtil.browse(url)
                 }
             )
-            .show(project)
+        }
+        updateNotification.show(project)
     }
 }

src/main/kotlin/com/vk/admstorm/diagnostic/AdmStormLoggerFactory.kt

@@ -6,7 +6,7 @@ import com.vk.admstorm.services.SentryService
 
 class AdmStormLoggerFactory(private val sentry: SentryService, private val factoryDelegate: Logger.Factory) : Logger.Factory {
     override fun getLoggerInstance(category: String): Logger {
-        if (category.contains(AdmService.PLUGIN_ID.idString)) {
+        if (category.contains(AdmService.ADM_PLUGIN_ID.idString)) {
             return AdmStormLogger(sentry, factoryDelegate, category)
         }
 

src/main/kotlin/com/vk/admstorm/services/SentryService.kt

@@ -45,7 +45,7 @@ class SentryService(project: Project) {
             return
         }
 
-        val plugin = PluginManagerCore.getPlugin(AdmService.PLUGIN_ID)
+        val plugin = PluginManagerCore.getPlugin(AdmService.ADM_PLUGIN_ID)
         val application = ApplicationInfo.getInstance()
 
         LOG.info("Sending errors to Sentry is enabled")