From ee2d6486b442dcd32e78dec0745a6b8f3d806019 Mon Sep 17 00:00:00 2001
From: Dmitry Isaenko <developer.su@gmail.com>
Date: Mon, 18 Jul 2022 22:38:34 +0300
Subject: [PATCH] Move on Drone, remove malware Jenkins

---
 .drone.yml                                    | 29 ++++++++++++++
 Jenkinsfile                                   | 38 -------------------
 .../Commanders/flood/JoinFloodHandler.java    |  2 +-
 3 files changed, 30 insertions(+), 39 deletions(-)
 create mode 100644 .drone.yml
 delete mode 100644 Jenkinsfile

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..40ca1d2
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,29 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: test
+    image: maven:3-jdk-11
+    commands:
+      - mvn -B -DskipTests clean package
+    volumes:
+      - name: m2
+        path: /root/.m2
+
+  - name: archive-artifact
+    image: alpine:latest
+    commands:
+      - mkdir -p /builds/innaircbot
+      - cp target/InnaIrcBot-*jar /builds/innaircbot/
+    volumes:
+      - name: builds
+        path: /builds
+
+volumes:
+  - name: m2
+    host:
+      path: /home/docker/drone/files/m2
+  - name: builds
+    host:
+      path: /home/www/builds
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index bdacdb4..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,38 +0,0 @@
-pipeline {
-    agent {
-        docker {
-           image 'maven:3-alpine'
-            args '-v /home/docker/jenkins/files/m2:/root/.m2 -v /home/docker/innaircbot/files/artifact:/rel'
-        }
-    }
-
-    stages {
-        stage('Build') {
-            steps {
-                sh 'mvn -B -DskipTests clean package'
-            }
-            post {
-                success {
-                    archiveArtifacts artifacts: 'target/*.jar, target/*.exe'
-                }
-            }
-        }
-        stage('Test') {
-            steps {
-                sh 'mvn test'
-            }
-            post {
-                always {
-                    junit 'target/surefire-reports/*.xml'
-                }
-            }
-        }
-        stage('Deploy') {
-            steps {
-                sh 'cp  ./target/InnaIrcBot-*-jar-with-dependencies.jar /rel/InnaIrcBot.jar'
-                // TODO: consider switch to docker registry
-                // sh 'docker restart innaircbot'
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java b/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
index 1da8c28..fe2bbff 100644
--- a/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
+++ b/src/main/java/InnaIrcBot/Commanders/flood/JoinFloodHandler.java
@@ -66,7 +66,7 @@ public class JoinFloodHandler implements EventHandler {
         return fistJoinTime;
     }
     private void kickBanUser(String user){
-        StreamProvider.writeToStream(server,"PRIVMSG "+ channel +" :"+user+": join flood ("+ joinMaxNumber +" connections in "+timeFrameInSeconds+" seconds).\n");
+        StreamProvider.writeToStream(server,"PRIVMSG "+ channel +" :"+user+": join flood ("+ joinMaxNumber +" connections in "+timeFrameInSeconds+" seconds).");
         StreamProvider.writeToStream(server,"MODE "+ channel +" +b "+user+"!*@*"); // TODO: consider other ban methods
     }