From 7a2f89266c8f6337e4e81a2fd8488e0f80f4f9bd Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 3 Apr 2020 23:53:23 +0300
Subject: Reorganize layout and code cleanup

---
 src/main/java/com/juick/service/HelpService.java   | 69 ++++++++++++++++++++++
 .../com/juick/service/activities/FollowEvent.java  |  2 +-
 .../com/juick/service/component/SystemEvent.java   |  2 +-
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/juick/service/HelpService.java

(limited to 'src/main/java/com/juick/service')

diff --git a/src/main/java/com/juick/service/HelpService.java b/src/main/java/com/juick/service/HelpService.java
new file mode 100644
index 00000000..fef427ef
--- /dev/null
+++ b/src/main/java/com/juick/service/HelpService.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2008-2020, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.service;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.annotation.Cacheable;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Pattern;
+
+/**
+ * Created by aalexeev on 12/11/16.
+ */
+public class HelpService {
+    private static final Pattern LANG_PATTERN = Pattern.compile("[a-z]{2}");
+
+    private static final Pattern PAGE_PATTERN = Pattern.compile("[a-zA-Z0-9\\-_]+");
+
+    private final String helpPath;
+
+
+    public HelpService(String helpPath) {
+        this.helpPath = helpPath;
+    }
+
+    @Cacheable("help")
+    public String getHelp(final String page, final String lang) {
+        if (canBePage(page) && canBeLang(lang)) {
+            String path = StringUtils.joinWith("/", helpPath, lang, page + ".md");
+
+            try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path)) {
+                if (is != null)
+                    return IOUtils.toString(is, StandardCharsets.UTF_8);
+            } catch (IOException e) {
+            }
+        }
+        return null;
+    }
+
+    public boolean canBePage(final String anything) {
+        return anything != null && PAGE_PATTERN.matcher(anything).matches();
+    }
+
+    public boolean canBeLang(final String anything) {
+        return anything != null && LANG_PATTERN.matcher(anything).matches();
+    }
+
+    public String getHelpPath() {
+        return helpPath;
+    }
+}
diff --git a/src/main/java/com/juick/service/activities/FollowEvent.java b/src/main/java/com/juick/service/activities/FollowEvent.java
index 055b79f4..e7c144b7 100644
--- a/src/main/java/com/juick/service/activities/FollowEvent.java
+++ b/src/main/java/com/juick/service/activities/FollowEvent.java
@@ -17,7 +17,7 @@
 
 package com.juick.service.activities;
 
-import com.juick.server.api.activity.model.activities.Follow;
+import com.juick.www.api.activity.model.activities.Follow;
 import org.springframework.context.ApplicationEvent;
 
 public class FollowEvent extends ApplicationEvent {
diff --git a/src/main/java/com/juick/service/component/SystemEvent.java b/src/main/java/com/juick/service/component/SystemEvent.java
index f9908e8e..9db4ffcd 100644
--- a/src/main/java/com/juick/service/component/SystemEvent.java
+++ b/src/main/java/com/juick/service/component/SystemEvent.java
@@ -17,7 +17,7 @@
 
 package com.juick.service.component;
 
-import com.juick.server.api.SystemActivity;
+import com.juick.www.api.SystemActivity;
 import org.springframework.context.ApplicationEvent;
 
 public class SystemEvent extends ApplicationEvent {
-- 
cgit v1.2.3