mirror of
https://github.com/reddit-archive/reddit.git
synced 2026-02-17 09:51:45 -05:00
a402d48de3
* Discount 1.6.1
* Lines beginning with spaces are considered code. I don't know why markdown.py didn't trigger this.
* tables in mark down: why not?
* validation of resulting HTML vial libxml to prevent hax.
* private RSS and JSON feeds
* optional whitelists for subreddits
* Moderator messaging
Additions:
* destination sanitization to cut down on XSRF
* cosmetic fix to spam and reported listing
* make the rss feeds on messages useful
* /admin/errors
* Of the types of listings hitting the precomputers (top/controversy by hour/day/week/month/year), the ones over long periods of time don't change often. So we can try to run them at most once per day, and then merge in the day's listings.
* google analytics
* logging queue
* Created empty commentspanel.xml, errorpage.xml, login.xml
* add subreddit rules/info box to submit page
* add 'via' link on messages in moderator inbox
* add a show=all get parameter to link listings to optionally ignore hiding preferences.
* Raise edited timelimit to three mins
* Remove UI that makes it look like you can edit deleted selftexts
* Make it clearer to admins when a link is deleted
* Fix [S] leak on deleted comments
* Fix /user/[deleted] misrendering
* New house ads system
* updated so that minimalcontrollers actually can use the page cache.
* Added /admin/usage
Bugfixes:
* Reduce the number of results that we request from Solr and simplify that caching a bit
* Require a secret key to shut down app-servers
* Make get_title a little more resilient to malformed documents and slow remote servers
* Cause the SearchBuilder to only byID the results that it's going to render instead of all 1000
* Remove ability for an author to XSS himself
* fix spam listings and an xsrf
* More verbose VDestination
* Fixing the famous ?limit=0.1 error, and one last password-validation one
* distinguish deleted comments' and deleted links' error messages
* Don't allow ridiculously long log lines to widen the page
* Bug with HardCache.add() when existing key is expired
* Add adminbox next to domain
72 lines
2.7 KiB
XML
72 lines
2.7 KiB
XML
## The contents of this file are subject to the Common Public Attribution
|
|
## License Version 1.0. (the "License"); you may not use this file except in
|
|
## compliance with the License. You may obtain a copy of the License at
|
|
## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
|
|
## License Version 1.1, but Sections 14 and 15 have been added to cover use of
|
|
## software over a computer network and provide for limited attribution for the
|
|
## Original Developer. In addition, Exhibit A has been modified to be consistent
|
|
## with Exhibit B.
|
|
##
|
|
## Software distributed under the License is distributed on an "AS IS" basis,
|
|
## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
|
|
## the specific language governing rights and limitations under the License.
|
|
##
|
|
## The Original Code is Reddit.
|
|
##
|
|
## The Original Developer is the Initial Developer. The Initial Developer of
|
|
## the Original Code is CondeNet, Inc.
|
|
##
|
|
## All portions of the code written by CondeNet are Copyright (c) 2006-2010
|
|
## CondeNet, Inc. All Rights Reserved.
|
|
################################################################################
|
|
|
|
<%!
|
|
from r2.lib.filters import safemarkdown
|
|
from r2.lib.template_helpers import add_sr
|
|
%>
|
|
|
|
<%
|
|
permalink = add_sr(thing.permalink, force_hostname = True)
|
|
%>
|
|
<item>
|
|
<guid isPermaLink="true">${permalink}</guid>
|
|
<link>${permalink}</link>
|
|
<title>
|
|
<%
|
|
taglinetext = ''
|
|
if thing.to_id == c.user._id or thing.to_id is None:
|
|
taglinetext = _("from %(author)s sent %(when)s ago")
|
|
elif thing.author_id == c.user._id:
|
|
taglinetext = _("to %(dest)s sent %(when)s ago")
|
|
else:
|
|
taglinetext = _("to %(dest)s from %(author)s sent %(when)s ago")
|
|
|
|
author = thing.author.name
|
|
if thing.sr_id and not (getattr(thing, "is_child", False) or
|
|
getattr(thing, "is_parent", False)):
|
|
updated_author = _("%(author)s via %(subreddit)s")
|
|
subreddit = thing.subreddit.name
|
|
author = updated_author % dict(author = author, subreddit = subreddit)
|
|
%>
|
|
${thing.subject} : ${unsafe(taglinetext % dict(when = thing.timesince,
|
|
author= u"%s" % author,
|
|
dest = u"%s" % thing.to.name if thing.to else ""))}
|
|
</title>
|
|
<pubDate>${thing._date.strftime('%a, %d %b %Y %H:%M:%S %z')}</pubDate>
|
|
<dc:date>${thing._date.isoformat()}-0700</dc:date>
|
|
<description>
|
|
${description()}
|
|
</description>
|
|
</item>
|
|
|
|
<%def name="description()" filter="h">
|
|
${unsafe(safemarkdown(thing.body))}
|
|
<div>
|
|
%if thing.was_comment:
|
|
<a href="${permalink + '?context=3'}">[context]</a>
|
|
%else:
|
|
<a href="${permalink}">[full conversation]</a>
|
|
%endif
|
|
</div>
|
|
</%def>
|