1 files changed, 9 insertions, 15 deletions

diff --git a/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java b/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java
index 27ad35b8..261efff3 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java
@@ -28,9 +28,11 @@ import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
+import org.springframework.web.util.WebUtils;
 import ru.sape.Sape;
 
 import javax.inject.Inject;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
@@ -163,7 +165,12 @@ public class PageTemplates {
         String queryString = request.getQueryString();
         String requestURI = request.getRequestURI();
         if (sapeon && sape != null && (visitor.getUid() == 0 || visitor.getUid() == 1) && queryString == null) {
-            String links = sape.getPageLinks(requestURI, request.getCookies()).render();
+            String cookieValue = null;
+            Cookie sapeCookie = WebUtils.getCookie(request, "sape_cookie");
+            if (sapeCookie != null) {
+                cookieValue = sapeCookie.getValue();
+            }
+            String links = sape.getPageLinks(requestURI, cookieValue).render();
             if (links != null && !links.isEmpty()) {
                 out.print("<br/>Спонсоры: " + links);
             }
@@ -290,18 +297,9 @@ public class PageTemplates {
         }
     }
 
-    public void printMessages(PrintWriter out, com.juick.User user, List<Integer> mids, com.juick.User visitor, int YandexID, int ad_mid) {
+    public void printMessages(PrintWriter out, com.juick.User user, List<Integer> mids, com.juick.User visitor) {
         List<com.juick.Message> msgs = messagesService.getMessages(mids);
 
-        for (int i = 0; i < msgs.size(); i++) {
-            com.juick.Message msg = msgs.get(i);
-            if (msg.getMid() == ad_mid) {
-                msgs.remove(i);
-                msgs.add(0, msg);
-                break;
-            }
-        }
-
         List<Integer> blUIDs = new ArrayList<Integer>(20);
         if (visitor != null) {
             for (Message msg : msgs) {
@@ -320,10 +318,6 @@ public class PageTemplates {
             if (msg.getPrivacy() < 0) {
                 tagsStr += "<a>friends</a>";
             }
-            if (msg.getMid() == ad_mid) {
-                tagsStr += "<a>реклама</a>";
-            }
-
             String txt;
             if (msg.getTags().stream().anyMatch(t -> t.getName().equals("code"))) {
                 txt = MessageUtils.formatMessageCode(msg.getText());