diff --git a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java index 0d6d858c7..6ad973cd0 100644 --- a/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java +++ b/apps/syndie/java/src/net/i2p/syndie/data/BlogInfo.java @@ -55,6 +55,7 @@ public class BlogInfo { public static final String SIGNATURE = "Signature"; public static final String NAME = "Name"; public static final String DESCRIPTION = "Description"; + public static final String CONTACT_URL = "ContactURL"; public static final String EDITION = "Edition"; public void load(InputStream in) throws IOException { diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java index 3496690ef..847947b5e 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java @@ -400,8 +400,12 @@ public class HTMLRenderer extends EventReceiverImpl { if (location != null) { _bodyBuffer.append(" at "); SafeURL surl = new SafeURL(locationSchema + "://" + location); - _bodyBuffer.append("").append(sanitizeString(surl.toString())).append(""); + if (BlogManager.instance().authorizeRemote(_user)) { + _bodyBuffer.append("").append(sanitizeString(surl.toString())).append(""); + } else { + _bodyBuffer.append(sanitizeString(surl.getLocation())); + } if (_user.getAuthenticated()) { _bodyBuffer.append(" 0) ) { + try { + Hash key = new Hash(); + key.fromBase64(loc); + PetNameDB db = user.getPetNameDB(); + PetName pn = db.getByLocation(loc); + boolean isNew = false; + if (pn == null) { + isNew = true; + BlogInfo info = BlogManager.instance().getArchive().getBlogInfo(key); + String name = null; + if (info != null) + name = info.getProperty(BlogInfo.NAME); + else + name = loc.substring(0,6); + + if (db.containsName(name)) { + int i = 0; + while (db.containsName(name + i)) + i++; + name = name + i; + } + + pn = new PetName(name, "syndie", "syndieblog", loc); + } + pn.addGroup(group); + if (isNew) + db.add(pn); + BlogManager.instance().saveUser(user); + // if we are ignoring someone, we need to recalculate the filters + if (FilteredThreadIndex.GROUP_IGNORE.equals(group)) + rv = true; + } catch (DataFormatException dfe) { + // bad loc, ignore + } + } + + String name = req.getParameter(ThreadedHTMLRenderer.PARAM_REMOVE_FROM_GROUP_NAME); + group = req.getParameter(ThreadedHTMLRenderer.PARAM_REMOVE_FROM_GROUP); + if ( (name != null) && (name.trim().length() > 0) ) { + PetNameDB db = user.getPetNameDB(); + PetName pn = db.getByName(name); + boolean changed = false; + if (pn != null) { + if ( (group != null) && (group.trim().length() > 0) ) { + // just remove them from the group + changed = pn.isMember(group); + pn.removeGroup(group); + if ( (changed) && (FilteredThreadIndex.GROUP_IGNORE.equals(group)) ) + rv = true; + } else { + // remove it completely + if (pn.isMember(FilteredThreadIndex.GROUP_IGNORE)) + rv = true; + db.remove(pn); + changed = true; + } + } + if (changed) + BlogManager.instance().saveUser(user); + } + + return rv; + } + + protected void handleUpdateProfile(User user, HttpServletRequest req) { + if ( (user == null) || (!user.getAuthenticated()) || (user.getBlog() == null) ) + return; + + String action = req.getParameter("action"); + if ( (action == null) || !("Update profile".equals(action)) ) + return; + + String name = req.getParameter(ThreadedHTMLRenderer.PARAM_PROFILE_NAME); + String desc = req.getParameter(ThreadedHTMLRenderer.PARAM_PROFILE_DESC); + String url = req.getParameter(ThreadedHTMLRenderer.PARAM_PROFILE_URL); + String other = req.getParameter(ThreadedHTMLRenderer.PARAM_PROFILE_OTHER); + + Properties opts = new Properties(); + if (!empty(name)) + opts.setProperty(BlogInfo.NAME, name.trim()); + if (!empty(desc)) + opts.setProperty(BlogInfo.DESCRIPTION, desc.trim()); + if (!empty(url)) + opts.setProperty(BlogInfo.CONTACT_URL, url.trim()); + if (!empty(other)) { + StringBuffer key = new StringBuffer(); + StringBuffer val = null; + for (int i = 0; i < other.length(); i++) { + char c = other.charAt(i); + if ( (c == ':') || (c == '=') ) { + if (val != null) { + val.append(c); + } else { + val = new StringBuffer(); + } + } else if ( (c == '\n') || (c == '\r') ) { + String k = key.toString().trim(); + String v = (val != null ? val.toString().trim() : ""); + if ( (k.length() > 0) && (v.length() > 0) ) { + opts.setProperty(k, v); + } + key.setLength(0); + val = null; + } else if (val != null) { + val.append(c); + } else { + key.append(c); + } + } + // now finish the last of it + String k = key.toString().trim(); + String v = (val != null ? val.toString().trim() : ""); + if ( (k.length() > 0) && (v.length() > 0) ) { + opts.setProperty(k, v); + } + } + + boolean updated = BlogManager.instance().updateMetadata(user, user.getBlog(), opts); + } + + protected void render(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws ServletException, IOException { + Archive archive = BlogManager.instance().getArchive(); + int numThreads = 10; + int threadOffset = getOffset(req); + if (threadOffset == -1) { + threadOffset = index.getRootCount() - numThreads; + } + if (threadOffset < 0) { + threadOffset = 0; + } + + BlogURI visibleEntry = getVisible(req); + + int offset = 0; + if ( empty(req, ThreadedHTMLRenderer.PARAM_OFFSET) && (visibleEntry != null) ) { + // we're on a permalink, so jump the tree to the given thread + threadOffset = index.getRoot(visibleEntry); + if (threadOffset < 0) + threadOffset = 0; + } + + renderBegin(user, req, out, index); + renderNavBar(user, req, out, index); + renderControlBar(user, req, out, index); + renderServletDetails(user, req, out, index, threadOffset, visibleEntry, archive); + renderEnd(user, req, out, index); + } + + protected void renderBegin(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws IOException { + out.write(BEGIN_HTML); + } + protected void renderNavBar(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws IOException { + //out.write("\n"); + out.write("\n"); + out.write("\n"); + if (user.getAuthenticated() && (user.getBlog() != null) ) { + out.write("Logged in as "); + out.write(user.getUsername()); + out.write("\n"); + out.write("(switch)\n"); + out.write("Post a new thread\n"); + } else { + out.write("
\n"); + out.write("Login: \n"); + out.write("Password: \n"); + out.write("
\n"); + } + //out.write("\n"); + out.write("\n"); + if (user.getAuthenticated() && user.getAllowAccessRemote()) { + out.write("Syndicate\n"); + out.write("Import RSS/Atom\n"); + out.write("Admin\n"); + } + out.write("\n\n"); + } + + protected static final ArrayList SKIP_TAGS = new ArrayList(); + static { + SKIP_TAGS.add("action"); + SKIP_TAGS.add("filter"); + // post and visible are skipped since we aren't good at filtering by tag when the offset will + // skip around randomly. at least, not yet. + SKIP_TAGS.add("visible"); + //SKIP_TAGS.add("post"); + //SKIP_TAGS.add("thread"); + SKIP_TAGS.add("offset"); // if we are adjusting the filter, ignore the previous offset + SKIP_TAGS.add("login"); + SKIP_TAGS.add("password"); + } + + private static final String CONTROL_TARGET = "threads.jsp"; + protected String getControlTarget() { return CONTROL_TARGET; } + + protected void renderControlBar(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws IOException { + out.write("
\n"); + String tags = ""; + String author = ""; + Enumeration params = req.getParameterNames(); + while (params.hasMoreElements()) { + String param = (String)params.nextElement(); + String val = req.getParameter(param); + if (ThreadedHTMLRenderer.PARAM_TAGS.equals(param)) { + tags = val; + } else if (ThreadedHTMLRenderer.PARAM_AUTHOR.equals(param)) { + author = val; + } else if (SKIP_TAGS.contains(param)) { + // skip + } else if (param.length() <= 0) { + // skip + } else { + out.write("\n"); + } + } + out.write("\n"); + out.write("\n"); + out.write("Filter: \n"); + + out.write("Tags: \n"); + + out.write("\n"); + out.write("Threads\n"); + out.write("\n"); + out.write("\n"); + out.write("
\n"); + } + + protected abstract void renderServletDetails(User user, HttpServletRequest req, PrintWriter out, + ThreadIndex index, int threadOffset, BlogURI visibleEntry, + Archive archive) throws IOException; + + protected static final int getOffset(HttpServletRequest req) { + String off = req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET); + try { + return Integer.parseInt(off); + } catch (NumberFormatException nfe) { + return 0; + } + } + protected static final BlogURI getVisible(HttpServletRequest req) { + return getAsBlogURI(req.getParameter(ThreadedHTMLRenderer.PARAM_VISIBLE)); + } + protected static final BlogURI getAsBlogURI(String uri) { + if (uri != null) { + int split = uri.indexOf('/'); + if ( (split <= 0) || (split + 1 >= uri.length()) ) + return null; + String blog = uri.substring(0, split); + String id = uri.substring(split+1); + try { + Hash hash = new Hash(); + hash.fromBase64(blog); + long msgId = Long.parseLong(id); + if (msgId > 0) + return new BlogURI(hash, msgId); + } catch (DataFormatException dfe) { + return null; + } catch (NumberFormatException nfe) { + return null; + } + } + return null; + } + + + protected String trim(String orig, int maxLen) { + if ( (orig == null) || (orig.length() <= maxLen) ) + return orig; + return orig.substring(0, maxLen) + "..."; + } + + protected static final boolean empty(HttpServletRequest req, String param) { + String val = req.getParameter(param); + return (val == null) || (val.trim().length() <= 0); + } + + protected static final boolean empty(String val) { + return (val == null) || (val.trim().length() <= 0); + } + + protected String getExpandLink(HttpServletRequest req, ThreadNode node) { + return getExpandLink(node, req.getRequestURI(), req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_POST), + req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_THREAD), + req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), + req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), + req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); + } + protected static String getExpandLink(ThreadNode node, String uri, String viewPost, String viewThread, + String offset, String tags, String author) { + StringBuffer buf = new StringBuffer(64); + buf.append(uri); + buf.append('?'); + // expand node == let one of node's children be visible + if (node.getChildCount() > 0) { + ThreadNode child = node.getChild(0); + buf.append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('='); + buf.append(child.getEntry().getKeyHash().toBase64()).append('/'); + buf.append(child.getEntry().getEntryId()).append('&'); + } + + if (!empty(viewPost)) + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_POST).append('=').append(viewPost).append('&'); + else if (!empty(viewThread)) + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('=').append(viewThread).append('&'); + + if (!empty(offset)) + buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); + + if (!empty(tags)) + buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); + + if (!empty(author)) + buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(author).append('&'); + + return buf.toString(); + } + protected String getCollapseLink(HttpServletRequest req, ThreadNode node) { + return getCollapseLink(node, req.getRequestURI(), + req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_POST), + req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_THREAD), + req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), + req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), + req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); + } + + protected String getCollapseLink(ThreadNode node, String uri, String viewPost, String viewThread, + String offset, String tags, String author) { + StringBuffer buf = new StringBuffer(64); + buf.append(uri); + // collapse node == let the node be visible + buf.append('?').append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('='); + buf.append(node.getEntry().getKeyHash().toBase64()).append('/'); + buf.append(node.getEntry().getEntryId()).append('&'); + + if (!empty(viewPost)) + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_POST).append('=').append(viewPost).append('&'); + else if (!empty(viewThread)) + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('=').append(viewThread).append('&'); + + if (!empty(offset)) + buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); + + if (!empty(tags)) + buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); + + if (!empty(author)) + buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(author).append('&'); + + return buf.toString(); + } + protected String getProfileLink(HttpServletRequest req, Hash author) { + return getProfileLink(author); + } + protected String getProfileLink(Hash author) { return ThreadedHTMLRenderer.buildProfileURL(author); } + + protected String getAddToGroupLink(HttpServletRequest req, Hash author, User user, String group) { + return getAddToGroupLink(user, author, group, req.getRequestURI(), + req.getParameter(ThreadedHTMLRenderer.PARAM_VISIBLE), + req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_POST), + req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_THREAD), + req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), + req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), + req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); + } + protected String getAddToGroupLink(User user, Hash author, String group, String uri, String visible, + String viewPost, String viewThread, String offset, String tags, String filteredAuthor) { + StringBuffer buf = new StringBuffer(64); + buf.append(uri); + buf.append('?'); + if (!empty(visible)) + buf.append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('=').append(visible).append('&'); + buf.append(ThreadedHTMLRenderer.PARAM_ADD_TO_GROUP_LOCATION).append('=').append(author.toBase64()).append('&'); + buf.append(ThreadedHTMLRenderer.PARAM_ADD_TO_GROUP_NAME).append('=').append(group).append('&'); + + if (!empty(viewPost)) + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_POST).append('=').append(viewPost).append('&'); + else if (!empty(viewThread)) + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('=').append(viewThread).append('&'); + + if (!empty(offset)) + buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); + + if (!empty(tags)) + buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); + + if (!empty(filteredAuthor)) + buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(filteredAuthor).append('&'); + + return buf.toString(); + } + protected String getRemoveFromGroupLink(User user, String name, String group, String uri, String visible, + String viewPost, String viewThread, String offset, String tags, String filteredAuthor) { + StringBuffer buf = new StringBuffer(64); + buf.append(uri); + buf.append('?'); + if (!empty(visible)) + buf.append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('=').append(visible).append('&'); + buf.append(ThreadedHTMLRenderer.PARAM_REMOVE_FROM_GROUP_NAME).append('=').append(name).append('&'); + buf.append(ThreadedHTMLRenderer.PARAM_REMOVE_FROM_GROUP).append('=').append(group).append('&'); + + if (!empty(viewPost)) + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_POST).append('=').append(viewPost).append('&'); + else if (!empty(viewThread)) + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('=').append(viewThread).append('&'); + + if (!empty(offset)) + buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); + + if (!empty(tags)) + buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); + + if (!empty(filteredAuthor)) + buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(filteredAuthor).append('&'); + + return buf.toString(); + } + protected String getViewPostLink(HttpServletRequest req, ThreadNode node, User user, boolean isPermalink) { + return ThreadedHTMLRenderer.getViewPostLink(req.getRequestURI(), node, user, isPermalink, + req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), + req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), + req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); + } + protected String getViewThreadLink(HttpServletRequest req, ThreadNode node, User user) { + return getViewThreadLink(req.getRequestURI(), node, user, + req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), + req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), + req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); + } + protected static String getViewThreadLink(String uri, ThreadNode node, User user, String offset, + String tags, String author) { + StringBuffer buf = new StringBuffer(64); + buf.append(uri); + if (node.getChildCount() > 0) { + buf.append('?').append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('='); + ThreadNode child = node.getChild(0); + buf.append(child.getEntry().getKeyHash().toBase64()).append('/'); + buf.append(child.getEntry().getEntryId()).append('&'); + } else { + buf.append('?').append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('='); + buf.append(node.getEntry().getKeyHash().toBase64()).append('/'); + buf.append(node.getEntry().getEntryId()).append('&'); + } + buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('='); + buf.append(node.getEntry().getKeyHash().toBase64()).append('/'); + buf.append(node.getEntry().getEntryId()).append('&'); + + if (!empty(offset)) + buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); + + if (!empty(tags)) + buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); + + if (!empty(author)) + buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(author).append('&'); + + buf.append("#").append(node.getEntry().toString()); + return buf.toString(); + } + protected String getFilterByTagLink(HttpServletRequest req, ThreadNode node, User user, String tag, String author) { + return ThreadedHTMLRenderer.getFilterByTagLink(req.getRequestURI(), node, user, tag, author); + } + protected String getNavLink(HttpServletRequest req, int offset) { + return ThreadedHTMLRenderer.getNavLink(req.getRequestURI(), + req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_POST), + req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_THREAD), + req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), + req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR), + offset); + } + + protected void renderEnd(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws IOException { + out.write(END_HTML); + } + + protected Collection getFilteredTags(HttpServletRequest req) { + String tags = req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS); + if (tags != null) { + StringTokenizer tok = new StringTokenizer(tags, "\n\t "); + ArrayList rv = new ArrayList(); + while (tok.hasMoreTokens()) { + String tag = tok.nextToken().trim(); + if (tag.length() > 0) + rv.add(tag); + } + return rv; + } else { + return Collections.EMPTY_LIST; + } + } + + protected Collection getFilteredAuthors(HttpServletRequest req) { + String authors = req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR); + if (authors != null) { + StringTokenizer tok = new StringTokenizer(authors, "\n\t "); + ArrayList rv = new ArrayList(); + while (tok.hasMoreTokens()) { + try { + Hash h = new Hash(); + h.fromBase64(tok.nextToken().trim()); + rv.add(h); + } catch (DataFormatException dfe) {} + } + return rv; + } else { + return Collections.EMPTY_LIST; + } + } + + private static final String BEGIN_HTML = "\n" + +"\n" + +"Syndie\n" + +"\n" + +"\n" + +"\n" + +"\n" + +"\n" + +"Jump to the beginning of the first post rendered, if any\n" + +"Jump to the thread navigation\n\n" + +"\n"; + + private static final String END_HTML = "
\n" + +"\n"; + + protected static class TreeRenderState { + private int _rowsWritten; + private int _rowsSkipped; + private List _ignored; + public TreeRenderState(List ignored) { + _rowsWritten = 0; + _rowsSkipped = 0; + _ignored = ignored; + } + public int getRowsWritten() { return _rowsWritten; } + public void incrementRowsWritten() { _rowsWritten++; } + public int getRowsSkipped() { return _rowsSkipped; } + public void incrementRowsSkipped() { _rowsSkipped++; } + public List getIgnoredAuthors() { return _ignored; } + } +} diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java new file mode 100644 index 000000000..7ddbfc9b3 --- /dev/null +++ b/apps/syndie/java/src/net/i2p/syndie/web/ProfileServlet.java @@ -0,0 +1,209 @@ +package net.i2p.syndie.web; + +import java.io.*; +import java.util.*; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; + +import net.i2p.I2PAppContext; +import net.i2p.client.naming.*; +import net.i2p.data.*; +import net.i2p.syndie.*; +import net.i2p.syndie.data.*; +import net.i2p.syndie.sml.*; + +/** + * Render the requested profile + * + */ +public class ProfileServlet extends BaseServlet { + protected void renderServletDetails(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index, + int threadOffset, BlogURI visibleEntry, Archive archive) throws IOException { + Hash author = null; + String str = req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR); + if (str != null) { + try { + author = new Hash(); + author.fromBase64(str); + } catch (DataFormatException dfe) { + author = null; + } + } else { + author = user.getBlog(); + } + + String uri = req.getRequestURI(); + + if (author == null) { + renderInvalidProfile(out); + } else if ( (user.getBlog() != null) && (user.getBlog().equals(author)) ) { + renderMyProfile(user, uri, out, archive); + } else { + renderProfile(user, uri, out, author, archive); + } + } + + private void renderInvalidProfile(PrintWriter out) throws IOException { + out.write(INVALID_PROFILE); + } + + private void renderMyProfile(User user, String baseURI, PrintWriter out, Archive archive) throws IOException { + BlogInfo info = archive.getBlogInfo(user.getBlog()); + if (info == null) + return; + + out.write("\n"); + out.write("
\n"); + // now add the form to update + out.write("Your profile\n"); + out.write("Name: \n"); + out.write("Account description: \n"); + out.write("Contact information: \n"); + out.write("Other attributes:
\n"); + + out.write("\n"); + out.write("
\n"); + } + + private void renderProfile(User user, String baseURI, PrintWriter out, Hash author, Archive archive) throws IOException { + out.write("Profile for \n"); - out.write("\n"); - out.write("\n"); - if (user.getAuthenticated()) { - out.write("Logged in as "); - out.write(user.getUsername()); - out.write("\n"); - out.write("(switch)\n"); - out.write("Post a new thread\n"); - } else { - out.write("
\n"); - out.write("Login: \n"); - out.write("Password: \n"); - out.write("
\n"); - } - //out.write("\n"); - out.write("\n"); - if (user.getAuthenticated() && user.getAllowAccessRemote()) { - out.write("Syndicate\n"); - out.write("Import RSS/Atom\n"); - out.write("Admin\n"); - } - out.write("\n\n"); - } - - private static final ArrayList SKIP_TAGS = new ArrayList(); - static { - SKIP_TAGS.add("action"); - SKIP_TAGS.add("filter"); - // post and visible are skipped since we aren't good at filtering by tag when the offset will - // skip around randomly. at least, not yet. - SKIP_TAGS.add("visible"); - //SKIP_TAGS.add("post"); - //SKIP_TAGS.add("thread"); - SKIP_TAGS.add("offset"); // if we are adjusting the filter, ignore the previous offset - SKIP_TAGS.add("login"); - SKIP_TAGS.add("password"); - } - - private void renderControlBar(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws IOException { - out.write("
\n"); - String tags = ""; - String author = ""; - Enumeration params = req.getParameterNames(); - while (params.hasMoreElements()) { - String param = (String)params.nextElement(); - String val = req.getParameter(param); - if (ThreadedHTMLRenderer.PARAM_TAGS.equals(param)) { - tags = val; - } else if (ThreadedHTMLRenderer.PARAM_AUTHOR.equals(param)) { - author = val; - } else if (SKIP_TAGS.contains(param)) { - // skip - } else if (param.length() <= 0) { - // skip - } else { - out.write("\n"); - } - } - out.write("\n"); - out.write("\n"); - out.write("Filter: \n"); - - out.write("Tags: \n"); - - out.write("\n"); - out.write("Threads\n"); - out.write("\n"); - out.write("\n"); - out.write("
\n"); - } - private void renderBody(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws IOException, ServletException { + private void renderBody(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws IOException { ThreadedHTMLRenderer renderer = new ThreadedHTMLRenderer(I2PAppContext.getGlobalContext()); Archive archive = BlogManager.instance().getArchive(); List posts = getPosts(archive, req, index); @@ -323,74 +117,7 @@ public class ViewThreadedServlet extends HttpServlet { int numThreads = 10; renderThreadTree(user, out, index, archive, req, threadOffset, numThreads, visibleEntry); } - - private static final int getOffset(HttpServletRequest req) { - String off = req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET); - try { - return Integer.parseInt(off); - } catch (NumberFormatException nfe) { - return 0; - } - } - private static final BlogURI getVisible(HttpServletRequest req) { - return getAsBlogURI(req.getParameter(ThreadedHTMLRenderer.PARAM_VISIBLE)); - } - private static final BlogURI getAsBlogURI(String uri) { - if (uri != null) { - int split = uri.indexOf('/'); - if ( (split <= 0) || (split + 1 >= uri.length()) ) - return null; - String blog = uri.substring(0, split); - String id = uri.substring(split+1); - try { - Hash hash = new Hash(); - hash.fromBase64(blog); - long msgId = Long.parseLong(id); - if (msgId > 0) - return new BlogURI(hash, msgId); - } catch (DataFormatException dfe) { - return null; - } catch (NumberFormatException nfe) { - return null; - } - } - return null; - } - - private Collection getFilteredTags(HttpServletRequest req) { - String tags = req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS); - if (tags != null) { - StringTokenizer tok = new StringTokenizer(tags, "\n\t "); - ArrayList rv = new ArrayList(); - while (tok.hasMoreTokens()) { - String tag = tok.nextToken().trim(); - if (tag.length() > 0) - rv.add(tag); - } - return rv; - } else { - return Collections.EMPTY_LIST; - } - } - - private Collection getFilteredAuthors(HttpServletRequest req) { - String authors = req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR); - if (authors != null) { - StringTokenizer tok = new StringTokenizer(authors, "\n\t "); - ArrayList rv = new ArrayList(); - while (tok.hasMoreTokens()) { - try { - Hash h = new Hash(); - h.fromBase64(tok.nextToken().trim()); - rv.add(h); - } catch (DataFormatException dfe) {} - } - return rv; - } else { - return Collections.EMPTY_LIST; - } - } - + private void renderThreadTree(User user, PrintWriter out, ThreadIndex index, Archive archive, HttpServletRequest req, int threadOffset, int numThreads, BlogURI visibleEntry) { @@ -421,12 +148,10 @@ public class ViewThreadedServlet extends HttpServlet { out.write("\n"); } - /** - * @return true if some post in the thread has been written - */ private boolean renderThread(User user, PrintWriter out, ThreadIndex index, Archive archive, HttpServletRequest req, ThreadNode node, int depth, BlogURI visibleEntry, TreeRenderState state) { boolean isFavorite = false; + boolean ignored = false; HTMLRenderer rend = new HTMLRenderer(I2PAppContext.getGlobalContext()); SMLParser parser = new SMLParser(I2PAppContext.getGlobalContext()); @@ -436,6 +161,8 @@ public class ViewThreadedServlet extends HttpServlet { if (pn.isMember(FilteredThreadIndex.GROUP_FAVORITE)) { isFavorite = true; } + if (pn.isMember(FilteredThreadIndex.GROUP_IGNORE)) + ignored = true; } state.incrementRowsWritten(); @@ -498,10 +225,12 @@ public class ViewThreadedServlet extends HttpServlet { } out.write("\n"); - if (node.getEntry().getKeyHash().equals(user.getBlog())) { + if ( (user.getBlog() != null) && (node.getEntry().getKeyHash().equals(user.getBlog())) ) { out.write("\"You\n"); } else if (isFavorite) { out.write("\"favorites\"\n"); + } else if (ignored) { + out.write("\"ignored\"\n"); } else { if (user.getAuthenticated()) { // give them a link to bookmark or ignore the peer @@ -547,14 +276,8 @@ public class ViewThreadedServlet extends HttpServlet { return rendered; } - private String trim(String orig, int maxLen) { - if ( (orig == null) || (orig.length() <= maxLen) ) - return orig; - return orig.substring(0, maxLen) + "..."; - } - private String getFlagHTML(User user, ThreadNode node) { - if (node.containsAuthor(user.getBlog())) + if ( (user.getBlog() != null) && (node.containsAuthor(user.getBlog())) ) return "\"You"; // grab all of the peers in the user's favorites group and check to see if @@ -579,282 +302,4 @@ public class ViewThreadedServlet extends HttpServlet { return " "; } - private static final boolean empty(HttpServletRequest req, String param) { - String val = req.getParameter(param); - return (val == null) || (val.trim().length() <= 0); - } - - private static final boolean empty(String val) { - return (val == null) || (val.trim().length() <= 0); - } - - private String getExpandLink(HttpServletRequest req, ThreadNode node) { - return getExpandLink(node, req.getRequestURI(), req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_POST), - req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_THREAD), - req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), - req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), - req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); - } - private static String getExpandLink(ThreadNode node, String uri, String viewPost, String viewThread, - String offset, String tags, String author) { - StringBuffer buf = new StringBuffer(64); - buf.append(uri); - buf.append('?'); - // expand node == let one of node's children be visible - if (node.getChildCount() > 0) { - ThreadNode child = node.getChild(0); - buf.append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('='); - buf.append(child.getEntry().getKeyHash().toBase64()).append('/'); - buf.append(child.getEntry().getEntryId()).append('&'); - } - - if (!empty(viewPost)) - buf.append(ThreadedHTMLRenderer.PARAM_VIEW_POST).append('=').append(viewPost).append('&'); - else if (!empty(viewThread)) - buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('=').append(viewThread).append('&'); - - if (!empty(offset)) - buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); - - if (!empty(tags)) - buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); - - if (!empty(author)) - buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(author).append('&'); - - return buf.toString(); - } - private String getCollapseLink(HttpServletRequest req, ThreadNode node) { - return getCollapseLink(node, req.getRequestURI(), - req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_POST), - req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_THREAD), - req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), - req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), - req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); - } - - private String getCollapseLink(ThreadNode node, String uri, String viewPost, String viewThread, - String offset, String tags, String author) { - StringBuffer buf = new StringBuffer(64); - buf.append(uri); - // collapse node == let the node be visible - buf.append('?').append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('='); - buf.append(node.getEntry().getKeyHash().toBase64()).append('/'); - buf.append(node.getEntry().getEntryId()).append('&'); - - if (!empty(viewPost)) - buf.append(ThreadedHTMLRenderer.PARAM_VIEW_POST).append('=').append(viewPost).append('&'); - else if (!empty(viewThread)) - buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('=').append(viewThread).append('&'); - - if (!empty(offset)) - buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); - - if (!empty(tags)) - buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); - - if (!empty(author)) - buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(author).append('&'); - - return buf.toString(); - } - private String getProfileLink(HttpServletRequest req, Hash author) { - return getProfileLink(author); - } - private static String getProfileLink(Hash author) { return HTMLRenderer.getMetadataURL(author); } - - private String getAddToGroupLink(HttpServletRequest req, Hash author, User user, String group) { - return getAddToGroupLink(user, author, group, req.getRequestURI(), - req.getParameter(ThreadedHTMLRenderer.PARAM_VISIBLE), - req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_POST), - req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_THREAD), - req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), - req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), - req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); - } - private String getAddToGroupLink(User user, Hash author, String group, String uri, String visible, - String viewPost, String viewThread, String offset, String tags, String filteredAuthor) { - StringBuffer buf = new StringBuffer(64); - buf.append(uri); - buf.append('?'); - if (!empty(visible)) - buf.append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('=').append(visible).append('&'); - buf.append(ThreadedHTMLRenderer.PARAM_ADD_TO_GROUP_LOCATION).append('=').append(author.toBase64()).append('&'); - buf.append(ThreadedHTMLRenderer.PARAM_ADD_TO_GROUP_NAME).append('=').append(group).append('&'); - - if (!empty(viewPost)) - buf.append(ThreadedHTMLRenderer.PARAM_VIEW_POST).append('=').append(viewPost).append('&'); - else if (!empty(viewThread)) - buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('=').append(viewThread).append('&'); - - if (!empty(offset)) - buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); - - if (!empty(tags)) - buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); - - if (!empty(filteredAuthor)) - buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(filteredAuthor).append('&'); - - return buf.toString(); - } - private String getViewPostLink(HttpServletRequest req, ThreadNode node, User user, boolean isPermalink) { - return ThreadedHTMLRenderer.getViewPostLink(req.getRequestURI(), node, user, isPermalink, - req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), - req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), - req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); - } - private String getViewThreadLink(HttpServletRequest req, ThreadNode node, User user) { - return getViewThreadLink(req.getRequestURI(), node, user, - req.getParameter(ThreadedHTMLRenderer.PARAM_OFFSET), - req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), - req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR)); - } - private static String getViewThreadLink(String uri, ThreadNode node, User user, String offset, - String tags, String author) { - StringBuffer buf = new StringBuffer(64); - buf.append(uri); - if (node.getChildCount() > 0) { - buf.append('?').append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('='); - ThreadNode child = node.getChild(0); - buf.append(child.getEntry().getKeyHash().toBase64()).append('/'); - buf.append(child.getEntry().getEntryId()).append('&'); - } else { - buf.append('?').append(ThreadedHTMLRenderer.PARAM_VISIBLE).append('='); - buf.append(node.getEntry().getKeyHash().toBase64()).append('/'); - buf.append(node.getEntry().getEntryId()).append('&'); - } - buf.append(ThreadedHTMLRenderer.PARAM_VIEW_THREAD).append('='); - buf.append(node.getEntry().getKeyHash().toBase64()).append('/'); - buf.append(node.getEntry().getEntryId()).append('&'); - - if (!empty(offset)) - buf.append(ThreadedHTMLRenderer.PARAM_OFFSET).append('=').append(offset).append('&'); - - if (!empty(tags)) - buf.append(ThreadedHTMLRenderer.PARAM_TAGS).append('=').append(tags).append('&'); - - if (!empty(author)) - buf.append(ThreadedHTMLRenderer.PARAM_AUTHOR).append('=').append(author).append('&'); - - buf.append("#").append(node.getEntry().toString()); - return buf.toString(); - } - private String getFilterByTagLink(HttpServletRequest req, ThreadNode node, User user, String tag, String author) { - return ThreadedHTMLRenderer.getFilterByTagLink(req.getRequestURI(), node, user, tag, author); - } - private String getNavLink(HttpServletRequest req, int offset) { - return ThreadedHTMLRenderer.getNavLink(req.getRequestURI(), - req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_POST), - req.getParameter(ThreadedHTMLRenderer.PARAM_VIEW_THREAD), - req.getParameter(ThreadedHTMLRenderer.PARAM_TAGS), - req.getParameter(ThreadedHTMLRenderer.PARAM_AUTHOR), - offset); - } - - private void renderEnd(User user, HttpServletRequest req, PrintWriter out, ThreadIndex index) throws IOException { - out.write(END_HTML); - } - - private static final String BEGIN_HTML = "\n" + -"\n" + -"Syndie\n" + -"\n" + -"\n" + -"\n" + -"\n" + -"\n" + -"Jump to the beginning of the first post rendered, if any\n" + -"Jump to the thread navigation\n\n" + -"\n"; - - private static final String END_HTML = "
\n" + -"\n"; - - private static class TreeRenderState { - private int _rowsWritten; - private int _rowsSkipped; - private List _ignored; - public TreeRenderState(List ignored) { - _rowsWritten = 0; - _rowsSkipped = 0; - _ignored = ignored; - } - public int getRowsWritten() { return _rowsWritten; } - public void incrementRowsWritten() { _rowsWritten++; } - public int getRowsSkipped() { return _rowsSkipped; } - public void incrementRowsSkipped() { _rowsSkipped++; } - public List getIgnoredAuthors() { return _ignored; } - } } diff --git a/apps/syndie/jsp/web.xml b/apps/syndie/jsp/web.xml index acdb2e131..52c3a854d 100644 --- a/apps/syndie/jsp/web.xml +++ b/apps/syndie/jsp/web.xml @@ -18,6 +18,11 @@ net.i2p.syndie.web.ViewThreadedServlet net.i2p.syndie.web.ViewThreadedServlet + + + net.i2p.syndie.web.ProfileServlet + net.i2p.syndie.web.ProfileServlet + net.i2p.syndie.UpdaterServlet @@ -45,6 +50,10 @@ net.i2p.syndie.web.ViewThreadedServlet /threads.jsp + + net.i2p.syndie.web.ProfileServlet + /profile.jsp +