From 796c55d1591acc0188c0c269409d914f0dce12c5 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Sat, 2 Nov 2013 03:25:18 +0700
Subject: Ad messages

---
 src/java/com/juick/http/www/Discover.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/java/com/juick/http/www/Discover.java')

diff --git a/src/java/com/juick/http/www/Discover.java b/src/java/com/juick/http/www/Discover.java
index a9ae360a..62822ee4 100644
--- a/src/java/com/juick/http/www/Discover.java
+++ b/src/java/com/juick/http/www/Discover.java
@@ -17,6 +17,7 @@
  */
 package com.juick.http.www;
 
+import com.juick.server.AdsQueries;
 import com.juick.server.MessagesQueries;
 import com.juick.server.TagQueries;
 import java.io.IOException;
@@ -110,13 +111,24 @@ public class Discover {
             out.println("<div id=\"content\">");
 
             if (mids.size() > 0) {
+                int ad_mid = 0;
+                if (visitor != null && paramShow == null && paramTag == 0 && paramSearch == null) {
+                    ad_mid = AdsQueries.getAdMID(sql, visitor.UID);
+                    if (ad_mid > 0 && mids.indexOf(ad_mid) == -1) {
+                        mids.add(0, ad_mid);
+                        AdsQueries.logAdMID(sql, visitor.UID, ad_mid);
+                    } else {
+                        ad_mid = 0;
+                    }
+                }
+
                 out.println("<ul>");
-                PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3);
+                PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3, ad_mid);
                 out.println("</ul>");
             }
 
             if (visitor != null) {
-                if (mids.size() == 20) {
+                if (mids.size() >= 20) {
                     String nextpage = "?before=" + mids.get(mids.size() - 1);
                     if (paramShow != null) {
                         nextpage += "&amp;show=" + paramShow;
-- 
cgit v1.2.3