Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

renamed branding

  • Loading branch information...
commit 8bffec86870ccaa63690c50e0dee2bf7c6204c82 1 parent bf9f43c
authored April 29, 2010

Showing 302 changed files with 1,770 additions and 1,770 deletions. Show diff stats Hide diff stats

  1. 6  LICENSE
  2. 12  config/solr/schema.xml
  3. 2  config/solr/server.xml
  4. 2  config/solr/solrconfig.xml
  5. 8  r2/Makefile
  6. 2  r2/babel.cfg
  7. 2  r2/check_procs.sh
  8. 26  r2/example.ini
  9. 2  r2/ez_setup/__init__.py
  10. 2  r2/r2/__init__.py
  11. 2  r2/r2/commands.py
  12. 2  r2/r2/config/__init__.py
  13. 2  r2/r2/config/admin_routes.py
  14. 6  r2/r2/config/environment.py
  15. 26  r2/r2/config/middleware.py
  16. 2  r2/r2/config/rewrites.py
  17. 24  r2/r2/config/routing.py
  18. 8  r2/r2/config/templates.py
  19. 2  r2/r2/config/utils.py
  20. 4  r2/r2/controllers/__init__.py
  21. 6  r2/r2/controllers/admin.py
  22. 74  r2/r2/controllers/api.py
  23. 4  r2/r2/controllers/awards.py
  24. 16  r2/r2/controllers/buttons.py
  25. 4  r2/r2/controllers/captcha.py
  26. 12  r2/r2/controllers/embed.py
  27. 20  r2/r2/controllers/error.py
  28. 8  r2/r2/controllers/errors.py
  29. 10  r2/r2/controllers/feedback.py
  30. 80  r2/r2/controllers/front.py
  31. 2  r2/r2/controllers/health.py
  32. 8  r2/r2/controllers/i18n.py
  33. 46  r2/r2/controllers/listingcontroller.py
  34. 4  r2/r2/controllers/mediaembed.py
  35. 4  r2/r2/controllers/post.py
  36. 4  r2/r2/controllers/promotecontroller.py
  37. 2  r2/r2/controllers/querycontroller.py
  38. 66  r2/r2/controllers/reddit_base.py
  39. 2  r2/r2/controllers/redirect.py
  40. 2  r2/r2/controllers/template.py
  41. 12  r2/r2/controllers/toolbar.py
  42. 2  r2/r2/controllers/validator/__init__.py
  43. 42  r2/r2/controllers/validator/validator.py
  44. 2  r2/r2/i18n/__init__.py
  45. BIN  r2/r2/i18n/en/LC_MESSAGES/r2.mo
  46. 352  r2/r2/i18n/en/LC_MESSAGES/r2.po
  47. 288  r2/r2/i18n/r2.pot
  48. 2  r2/r2/lib/__init__.py
  49. 10  r2/r2/lib/amqp.py
  50. 14  r2/r2/lib/app_globals.py
  51. 2  r2/r2/lib/authorize/__init__.py
  52. 2  r2/r2/lib/authorize/api.py
  53. 2  r2/r2/lib/authorize/interaction.py
  54. 4  r2/r2/lib/base.py
  55. 2  r2/r2/lib/c/filters.c
  56. 2  r2/r2/lib/c/recommendations/Database.cpp
  57. 2  r2/r2/lib/c/recommendations/Database.h
  58. 2  r2/r2/lib/c/recommendations/Dictionary.h
  59. 6  r2/r2/lib/c/recommendations/ModsTable.cpp
  60. 2  r2/r2/lib/c/recommendations/ModsTable.h
  61. 2  r2/r2/lib/c/recommendations/Recommender.cpp
  62. 2  r2/r2/lib/c/recommendations/Recommender.h
  63. 2  r2/r2/lib/c/recommendations/SparseMatrix.h
  64. 2  r2/r2/lib/c/recommendations/User.cpp
  65. 2  r2/r2/lib/c/recommendations/User.h
  66. 6  r2/r2/lib/c/recommendations/articles.cpp
  67. 2  r2/r2/lib/c/recommendations/articles.h
  68. 2  r2/r2/lib/c/recommendations/main.cpp
  69. 2  r2/r2/lib/c/recommendations/recommend_memcache.cpp
  70. 2  r2/r2/lib/c/recommendations/recommend_memcache.h
  71. 2  r2/r2/lib/c/recommendations/recommender_py.h
  72. 2  r2/r2/lib/cache.py
  73. 2  r2/r2/lib/captcha.py
  74. 2  r2/r2/lib/comment_tree.py
  75. 2  r2/r2/lib/contrib/nymph.py
  76. 6  r2/r2/lib/count.py
  77. 6  r2/r2/lib/cssfilter.py
  78. 2  r2/r2/lib/db/__init__.py
  79. 2  r2/r2/lib/db/alter_db.py
  80. 2  r2/r2/lib/db/operators.py
  81. 24  r2/r2/lib/db/queries.py
  82. 2  r2/r2/lib/db/sorts.py
  83. 8  r2/r2/lib/db/stats.py
  84. 2  r2/r2/lib/db/tdb_sql.py
  85. 2  r2/r2/lib/db/thing.py
  86. 2  r2/r2/lib/db/userrel.py
  87. 6  r2/r2/lib/emailer.py
  88. 2  r2/r2/lib/filters.py
  89. 2  r2/r2/lib/find_tz.py
  90. 2  r2/r2/lib/helpers.py
  91. 2  r2/r2/lib/html_source.py
  92. 2  r2/r2/lib/jsonresponse.py
  93. 22  r2/r2/lib/jsontemplates.py
  94. 2  r2/r2/lib/lock.py
  95. 2  r2/r2/lib/logger.py
  96. 2  r2/r2/lib/manager/__init__.py
  97. 2  r2/r2/lib/manager/db_manager.py
  98. 2  r2/r2/lib/manager/tp_manager.py
  99. 2  r2/r2/lib/media.py
  100. 2  r2/r2/lib/memoize.py
  101. 22  r2/r2/lib/menus.py
  102. 18  r2/r2/lib/migrate.py
  103. 12  r2/r2/lib/normalized_hot.py
  104. 18  r2/r2/lib/organic.py
  105. 2  r2/r2/lib/pages/__init__.py
  106. 4  r2/r2/lib/pages/admin_pages.py
  107. 2  r2/r2/lib/pages/graph.py
  108. 236  r2/r2/lib/pages/pages.py
  109. 2  r2/r2/lib/pages/things.py
  110. 14  r2/r2/lib/promote.py
  111. 6  r2/r2/lib/recommendation.py
  112. 4  r2/r2/lib/rising.py
  113. 2  r2/r2/lib/rpc.py
  114. 2  r2/r2/lib/s3cp.py
  115. 6  r2/r2/lib/scraper.py
  116. 6  r2/r2/lib/services.py
  117. 6  r2/r2/lib/set_reddit_pops.py
  118. 52  r2/r2/lib/solrsearch.py
  119. 30  r2/r2/lib/strings.py
  120. 14  r2/r2/lib/subreddit_search.py
  121. 4  r2/r2/lib/sup.py
  122. 30  r2/r2/lib/template_helpers.py
  123. 2  r2/r2/lib/test_cache.py
  124. 2  r2/r2/lib/test_wrapper.py
  125. 2  r2/r2/lib/tracking.py
  126. 6  r2/r2/lib/traffic.py
  127. 6  r2/r2/lib/translation.py
  128. 2  r2/r2/lib/utils/__init__.py
  129. 2  r2/r2/lib/utils/cmd_utils.py
  130. 14  r2/r2/lib/utils/reporting.py
  131. 68  r2/r2/lib/utils/utils.py
  132. 2  r2/r2/lib/workqueue.py
  133. 2  r2/r2/lib/wrapped.py
  134. 4  r2/r2/models/__init__.py
  135. 10  r2/r2/models/account.py
  136. 4  r2/r2/models/admintools.py
  137. 2  r2/r2/models/award.py
  138. 2  r2/r2/models/bidding.py
  139. 22  r2/r2/models/builder.py
  140. 96  r2/r2/models/link.py
  141. 2  r2/r2/models/listing.py
  142. 26  r2/r2/models/mail_queue.py
  143. 12  r2/r2/models/populatedb.py
  144. 4  r2/r2/models/printable.py
  145. 6  r2/r2/models/report.py
  146. 140  r2/r2/models/subreddit.py
  147. 2  r2/r2/models/thing_changes.py
  148. 12  r2/r2/models/types.py
  149. 12  r2/r2/models/update_karmas.py
  150. 6  r2/r2/models/vote.py
  151. 8  r2/r2/public/static/ad_default.html
  152. 4  r2/r2/public/static/css/mobile.css
  153. 64  r2/r2/public/static/css/reddit.css
  154. 2  r2/r2/public/static/defunct/comments.js
  155. 4  r2/r2/public/static/defunct/frame_piece.js
  156. 16  r2/r2/public/static/defunct/link.js
  157. 8  r2/r2/public/static/defunct/organic.js
  158. 76  r2/r2/public/static/defunct/reddit_piece.js
  159. 6  r2/r2/public/static/defunct/subreddit.js
  160. 2  r2/r2/public/static/defunct/tabular.js
  161. 18  r2/r2/public/static/defunct/utils.js
  162. 2  r2/r2/public/static/defunct/vote_piece.js
  163. 28  r2/r2/public/static/iphone/index.html
  164. 40  r2/r2/public/static/js/jquery.reddit.js
  165. 146  r2/r2/public/static/js/reddit.js
  166. 26  r2/r2/public/static/newlayout.css
  167. 14  r2/r2/public/static/reddit.js.old
  168. 44  r2/r2/public/static/redditaddict/index.html
  169. 40  r2/r2/public/static/socialite/index.html
  170. 8  r2/r2/public/static/wiredcomment.css
  171. 2  r2/r2/templates/__init__.py
  172. 2  r2/r2/templates/admin/__init__.py
  173. 2  r2/r2/templates/admin_rightbox.html
  174. 2  r2/r2/templates/adminawardgive.html
  175. 2  r2/r2/templates/adminawards.html
  176. 2  r2/r2/templates/adminawardwinners.html
  177. 2  r2/r2/templates/admintranslations.html
  178. 2  r2/r2/templates/ads.html
  179. 8  r2/r2/templates/appservicemonitor.html
  180. 4  r2/r2/templates/authorizedembed.html
  181. 2  r2/r2/templates/autohandler
  182. 8  r2/r2/templates/base.html
  183. 14  r2/r2/templates/base.htmllite
  184. 2  r2/r2/templates/base.mobile
  185. 6  r2/r2/templates/base.wired
  186. 4  r2/r2/templates/base.xml
  187. 4  r2/r2/templates/bookmarklets.html
  188. 6  r2/r2/templates/button.html
  189. 22  r2/r2/templates/buttondemopanel.html
  190. 14  r2/r2/templates/buttonembed.js
  191. 12  r2/r2/templates/buttonlite.js
  192. 2  r2/r2/templates/buttonnobody.html
  193. 22  r2/r2/templates/buttontypes.html
  194. 2  r2/r2/templates/captcha.html
  195. 2  r2/r2/templates/clickgadget.html
  196. 4  r2/r2/templates/cnameframe.html
  197. 2  r2/r2/templates/comment.html
  198. 2  r2/r2/templates/comment.htmllite
  199. 2  r2/r2/templates/comment.mobile
  200. 2  r2/r2/templates/comment.xml
  201. 2  r2/r2/templates/comment_skeleton.html
  202. 2  r2/r2/templates/commentspanel.html
  203. 14  r2/r2/templates/createsubreddit.html
  204. 2  r2/r2/templates/csserror.html
  205. 8  r2/r2/templates/dart_ad.html
  206. 2  r2/r2/templates/embed.html
  207. 2  r2/r2/templates/errorpage.html
  208. 2  r2/r2/templates/feedback.html
  209. 6  r2/r2/templates/frame.html
  210. 14  r2/r2/templates/framebuster.html
  211. 10  r2/r2/templates/frametoolbar.html
  212. 2  r2/r2/templates/gettextheader.html
  213. 2  r2/r2/templates/headerbar.mobile
  214. 2  r2/r2/templates/headerbar.xml
  215. 6  r2/r2/templates/helppage.html
  216. 2  r2/r2/templates/infobar.html
  217. 2  r2/r2/templates/infobar.htmllite
  218. 2  r2/r2/templates/infobar.mobile
  219. 2  r2/r2/templates/infobar.wired
  220. 2  r2/r2/templates/infobar.xml
  221. 6  r2/r2/templates/innertoolbarframe.html
  222. 2  r2/r2/templates/jquery.reddit.js
  223. 14  r2/r2/templates/link.html
  224. 12  r2/r2/templates/link.htmllite
  225. 18  r2/r2/templates/link.mobile
  226. 8  r2/r2/templates/link.wired
  227. 10  r2/r2/templates/link.xml
  228. 2  r2/r2/templates/linkinfobar.html
  229. 2  r2/r2/templates/linkpromoteinfobar.html
  230. 2  r2/r2/templates/listing.html
  231. 8  r2/r2/templates/listing.htmllite
  232. 2  r2/r2/templates/listing.mobile
  233. 2  r2/r2/templates/listing.wired
  234. 2  r2/r2/templates/listing.xml
  235. 2  r2/r2/templates/login.html
  236. 2  r2/r2/templates/login.mobile
  237. 2  r2/r2/templates/loginformwide.html
  238. 2  r2/r2/templates/mail_opt.email
  239. 2  r2/r2/templates/mediaembed.html
  240. 2  r2/r2/templates/mediaembedbody.html
  241. 2  r2/r2/templates/menuarea.html
  242. 2  r2/r2/templates/menuarea.htmllite
  243. 2  r2/r2/templates/menuarea.mobile
  244. 2  r2/r2/templates/menuarea.xml
  245. 2  r2/r2/templates/message.html
  246. 2  r2/r2/templates/message.xml
  247. 8  r2/r2/templates/messagecompose.html
  248. 2  r2/r2/templates/morechildren.html
  249. 2  r2/r2/templates/morechildren.htmllite
  250. 2  r2/r2/templates/morechildren.mobile
  251. 2  r2/r2/templates/morechildren.xml
  252. 2  r2/r2/templates/morerecursion.html
  253. 2  r2/r2/templates/morerecursion.htmllite
  254. 2  r2/r2/templates/morerecursion.mobile
  255. 2  r2/r2/templates/morerecursion.xml
  256. 2  r2/r2/templates/navbutton.html
  257. 2  r2/r2/templates/navbutton.mobile
  258. 2  r2/r2/templates/navmenu.html
  259. 2  r2/r2/templates/navmenu.htmllite
  260. 2  r2/r2/templates/navmenu.mobile
  261. 14  r2/r2/templates/newlink.html
  262. 2  r2/r2/templates/optout.html
  263. 4  r2/r2/templates/organiclisting.html
  264. 4  r2/r2/templates/over18.html
  265. 4  r2/r2/templates/page_down.html
  266. 16  r2/r2/templates/pagenamenav.html
  267. 12  r2/r2/templates/pagenamenav.mobile
  268. 2  r2/r2/templates/panestack.html
  269. 2  r2/r2/templates/panestack.htmllite
  270. 2  r2/r2/templates/panestack.mobile
  271. 2  r2/r2/templates/panestack.wired
  272. 2  r2/r2/templates/panestack.xml
  273. 2  r2/r2/templates/password.html
  274. 2  r2/r2/templates/passwordreset.email
  275. 2  r2/r2/templates/paymentform.html
  276. 2  r2/r2/templates/permalinkmessage.html
  277. 2  r2/r2/templates/permalinkmessage.mobile
  278. 2  r2/r2/templates/permalinkmessage.xml
  279. 4  r2/r2/templates/prefdelete.html
  280. 10  r2/r2/templates/prefoptions.html
  281. 2  r2/r2/templates/prefupdate.html
  282. 2  r2/r2/templates/printable.html
  283. 12  r2/r2/templates/printable.htmllite
  284. 2  r2/r2/templates/printable.mobile
  285. 2  r2/r2/templates/printablebuttons.html
  286. 6  r2/r2/templates/profilebar.html
  287. 2  r2/r2/templates/profiling.html
  288. 34  r2/r2/templates/promo_email.email
  289. 2  r2/r2/templates/promote_graph.html
  290. 4  r2/r2/templates/promotedlink.html
  291. 4  r2/r2/templates/promotedtraffic.html
  292. 4  r2/r2/templates/promotelinkform.html
  293. 18  r2/r2/templates/reddit.html
  294. 2  r2/r2/templates/reddit.htmllite
  295. 2  r2/r2/templates/reddit.js
  296. 4  r2/r2/templates/reddit.mobile
  297. 2  r2/r2/templates/reddit.wired
  298. 2  r2/r2/templates/reddit.xml
  299. 6  r2/r2/templates/redditfooter.html
  300. 6  r2/r2/templates/redditheader.html
  301. 6  r2/r2/templates/redditheader.mobile
6  LICENSE
@@ -472,7 +472,7 @@ EXHIBIT A. Common Public Attribution License Version 1.0.
472 472
 "The contents of this file are subject to the Common Public Attribution License
473 473
 Version 1.0. (the "License"); you may not use this file except in compliance
474 474
 with the License. You may obtain a copy of the License at
475  
-http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  475
+http://code.digg.com/LICENSE. The License is based on the Mozilla Public
476 476
 License Version 1.1, but Sections 14 and 15 have been added to cover use of
477 477
 software over a computer network and provide for limited attribution for the
478 478
 Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -497,10 +497,10 @@ Reserved.
497 497
 
498 498
 Attribution Phrase (not exceeding 10 words): Powered by Reddit
499 499
 
500  
-Attribution URL: http://code.reddit.com
  500
+Attribution URL: http://code.digg.com
501 501
 
502 502
 Graphic Image as provided in the Covered Code:
503  
-http://code.reddit.com/reddit_logo.png
  503
+http://code.digg.com/reddit_logo.png
504 504
 
505 505
 Display of Attribution Information is required in Larger Works which are defined
506 506
 in the CPAL as a work which combines Covered Code or portions thereof with code
12  config/solr/schema.xml
@@ -3,7 +3,7 @@
3 3
 "The contents of this file are subject to the Common Public Attribution
4 4
 License Version 1.0. (the "License"); you may not use this file except in
5 5
 compliance with the License. You may obtain a copy of the License at
6  
-http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  6
+http://code.digg.com/LICENSE. The License is based on the Mozilla Public
7 7
 License Version 1.1, but Sections 14 and 15 have been added to cover use of
8 8
 software over a computer network and provide for limited attribution for the
9 9
 Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -22,7 +22,7 @@ All portions of the code written by CondeNet are Copyright (c) 2006-2009
22 22
 CondeNet, Inc. All Rights Reserved.
23 23
 -->
24 24
 
25  
-<schema name="reddit" version="1.1">
  25
+<schema name="digg" version="1.1">
26 26
   <types>
27 27
     <!-- field type definitions. The "name" attribute is
28 28
        just a label to be used by field definitions.  The "class"
@@ -387,10 +387,10 @@ CondeNet, Inc. All Rights Reserved.
387 387
    <field name="points"      type="sint"    indexed="true" stored="true"  required="true" reversed="true" />
388 388
    <field name="spam"        type="boolean" indexed="true" stored="true"  required="false" />
389 389
    <field name="deleted"     type="boolean" indexed="true" stored="true"  required="false" />
390  
-   <!-- subreddit,link,comment -->
  390
+   <!-- subdigg,link,comment -->
391 391
    <field name="author_id"   type="integer" indexed="true" stored="false" required="false" />
392 392
    <field name="author"      type="string"  indexed="true" stored="false" required="false" />
393  
-   <!-- subreddit -->
  393
+   <!-- subdigg -->
394 394
    <field name="title"       type="text"    indexed="true" stored="false" required="false" />
395 395
    <field name="description" type="text"    indexed="true" stored="false" required="false" />
396 396
    <field name="firsttext"   type="text"    indexed="true" stored="false" required="false" />
@@ -399,8 +399,8 @@ CondeNet, Inc. All Rights Reserved.
399 399
    <field name="sr_type"     type="string"  indexed="true" stored="false" required="false" />
400 400
    <!-- link -->
401 401
    <field name="sr_id"       type="integer" indexed="true" stored="false" required="false" />
402  
-   <field name="reddit"      type="string"  indexed="true" stored="false" required="false" />
403  
-   <field name="subreddit"   type="string"  indexed="true" stored="false" required="false" />
  402
+   <field name="digg"      type="string"  indexed="true" stored="false" required="false" />
  403
+   <field name="subdigg"   type="string"  indexed="true" stored="false" required="false" />
404 404
    <field name="url"         type="text"    indexed="true" stored="false" required="false" />
405 405
    <field name="domain"      type="string"  indexed="true" stored="false" required="false" multiValued="true" />
406 406
    <field name="site"        type="string"  indexed="true" stored="false" required="false" multiValued="true" />
2  config/solr/server.xml
@@ -3,7 +3,7 @@
3 3
 "The contents of this file are subject to the Common Public Attribution
4 4
 License Version 1.0. (the "License"); you may not use this file except in
5 5
 compliance with the License. You may obtain a copy of the License at
6  
-http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  6
+http://code.digg.com/LICENSE. The License is based on the Mozilla Public
7 7
 License Version 1.1, but Sections 14 and 15 have been added to cover use of
8 8
 software over a computer network and provide for limited attribution for the
9 9
 Original Developer. In addition, Exhibit A has been modified to be consistent
2  config/solr/solrconfig.xml
@@ -3,7 +3,7 @@
3 3
 "The contents of this file are subject to the Common Public Attribution
4 4
 License Version 1.0. (the "License"); you may not use this file except in
5 5
 compliance with the License. You may obtain a copy of the License at
6  
-http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  6
+http://code.digg.com/LICENSE. The License is based on the Mozilla Public
7 7
 License Version 1.1, but Sections 14 and 15 have been added to cover use of
8 8
 software over a computer network and provide for limited attribution for the
9 9
 Original Developer. In addition, Exhibit A has been modified to be consistent
8  r2/Makefile
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -21,10 +21,10 @@
21 21
 ################################################################################
22 22
 
23 23
 # Jacascript files to be compressified
24  
-js_targets  = jquery.js jquery.json.js jquery.reddit.js reddit.js ui.core.js ui.datepicker.js sponsored.js
  24
+js_targets  = jquery.js jquery.json.js jquery.digg.js reddit.js ui.core.js ui.datepicker.js sponsored.js
25 25
 # CSS targets 
26  
-main_css = reddit.css
27  
-css_targets = reddit-ie6-hax.css reddit-ie7-hax.css mobile.css spreadshirt.css
  26
+main_css = digg.css
  27
+css_targets = digg-ie6-hax.css reddit-ie7-hax.css mobile.css spreadshirt.css
28 28
 
29 29
 SED=sed
30 30
 CAT=cat
2  r2/babel.cfg
... ...
@@ -1,7 +1,7 @@
1 1
 ## The contents of this file are subject to the Common Public Attribution
2 2
 ## License Version 1.0. (the "License"); you may not use this file except in
3 3
 ## compliance with the License. You may obtain a copy of the License at
4  
-## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+## http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 ## License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 ## software over a computer network and provide for limited attribution for the
7 7
 ## Original Developer. In addition, Exhibit A has been modified to be consistent
2  r2/check_procs.sh
... ...
@@ -1,4 +1,4 @@
1 1
 #!/bin/sh
2 2
 
3  
-cd /home/ri/reddit/r2
  3
+cd /home/ri/digg/r2
4 4
 /usr/bin/paster run local.ini supervise_watcher.py -c "Alert(restart_list=['MEM'])"
26  r2/example.ini
@@ -47,16 +47,16 @@ amqp_virtual_host = /
47 47
 databases = main, comment, vote, change, email, authorize, award
48 48
 
49 49
 #db name         db           host       user, pass
50  
-main_db =        newreddit,   127.0.0.1, ri,   password
51  
-comment_db =     newreddit,   127.0.0.1, ri,   password
52  
-comment2_db =    newreddit,   127.0.0.1, ri,   password
53  
-vote_db =        newreddit,   127.0.0.1, ri,   password
  50
+main_db =        newdigg,   127.0.0.1, ri,   password
  51
+comment_db =     newdigg,   127.0.0.1, ri,   password
  52
+comment2_db =    newdigg,   127.0.0.1, ri,   password
  53
+vote_db =        newdigg,   127.0.0.1, ri,   password
54 54
 change_db =      changed,     127.0.0.1, ri,   password
55 55
 email_db =       email,       127.0.0.1, ri,   password
56 56
 authorize_db =   authorize,   127.0.0.1, ri,   password
57 57
 award_db =       award,       127.0.0.1, ri,   password
58 58
 
59  
-db_app_name = reddit
  59
+db_app_name = digg
60 60
 db_create_tables = True
61 61
 
62 62
 type_db = main
@@ -70,9 +70,9 @@ db_table_savehide = relation, account, link, main
70 70
 db_table_click = relation, account, link, main
71 71
 
72 72
 db_table_comment = thing, comment
73  
-db_table_subreddit = thing, comment
  73
+db_table_subdigg = thing, comment
74 74
 
75  
-db_table_srmember = relation, subreddit, account, comment
  75
+db_table_srmember = relation, subdigg, account, comment
76 76
 
77 77
 db_table_friend = relation, account, account, comment
78 78
 
@@ -85,7 +85,7 @@ db_table_inbox_account_message = relation, account, message, main
85 85
 db_table_report_account_link = relation, account, link, main
86 86
 db_table_report_account_comment = relation, account, comment, comment
87 87
 db_table_report_account_message = relation, account, message, main
88  
-db_table_report_account_subreddit = relation, account, subreddit, main
  88
+db_table_report_account_subdigg = relation, account, subreddit, main
89 89
 
90 90
 db_table_award = thing, award
91 91
 db_table_trophy = relation, account, award, award
@@ -107,8 +107,8 @@ enable_doquery = False
107 107
 use_query_cache = False
108 108
 write_query_queue = False
109 109
 
110  
-stylesheet = reddit.css
111  
-stylesheet_rtl = reddit_rtl.css
  110
+stylesheet = digg.css
  111
+stylesheet_rtl = digg_rtl.css
112 112
 
113 113
 allowed_css_linked_domains = my.domain.com, my.otherdomain.com
114 114
 css_killswitch = False
@@ -116,12 +116,12 @@ max_sr_images = 20
116 116
 
117 117
 show_awards = False
118 118
 
119  
-login_cookie = reddit_session
  119
+login_cookie = digg_session
120 120
 domain = localhost
121 121
 domain_prefix = 
122 122
 media_domain = localhost
123 123
 default_sr = localhost
124  
-automatic_reddits = 
  124
+automatic_diggs = 
125 125
 
126 126
 admins = 
127 127
 sponsors = 
@@ -164,7 +164,7 @@ RATELIMIT = 10
164 164
 
165 165
 num_comments = 200
166 166
 max_comments = 500
167  
-num_default_reddits = 10
  167
+num_default_diggs = 10
168 168
 num_serendipity = 100
169 169
 sr_dropdown_threshold = 15
170 170
 
2  r2/ez_setup/__init__.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
2  r2/r2/__init__.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
2  r2/r2/commands.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
2  r2/r2/config/__init__.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
2  r2/r2/config/admin_routes.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
6  r2/r2/config/environment.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -33,7 +33,7 @@
33 33
 import r2.lib.app_globals as app_globals
34 34
 from   r2.lib import  rpc
35 35
 import r2.lib.helpers
36  
-import r2.config as reddit_config
  36
+import r2.config as digg_config
37 37
 
38 38
 from r2.templates import tmpl_dirs
39 39
 
@@ -74,7 +74,7 @@ def load_environment(global_conf={}, app_conf={}):
74 74
     # note that all config options will override
75 75
     # any Pylons config options
76 76
     g = config['pylons.g']
77  
-    reddit_config.cache = g.cache
  77
+    digg_config.cache = g.cache
78 78
 
79 79
     # Return our loaded config object
80 80
     #return config.Config(tmpl_options, map, paths)
26  r2/r2/config/middleware.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -275,7 +275,7 @@ def __call__(self, environ, start_response):
275 275
                 elif self.is_auth_cname(sub_domains):
276 276
                     environ['frameless_cname'] = True
277 277
                     environ['authorized_cname'] = True
278  
-                elif ("redditSession=cname" in environ.get('HTTP_COOKIE', '')
  278
+                elif ("diggSession=cname" in environ.get('HTTP_COOKIE', '')
279 279
                       and environ['REQUEST_METHOD'] != 'POST'
280 280
                       and not environ['PATH_INFO'].startswith('/error')):
281 281
                     environ['original_path'] = environ['PATH_INFO']
@@ -294,12 +294,12 @@ def __call__(self, environ, start_response):
294 294
                 continue
295 295
             # subdomains which change the extension
296 296
             elif sd == 'm':
297  
-                environ['reddit-domain-extension'] = 'mobile'
  297
+                environ['digg-domain-extension'] = 'mobile'
298 298
             elif sd in ('api', 'rss', 'xml', 'json'):
299  
-                environ['reddit-domain-extension'] = sd
  299
+                environ['digg-domain-extension'] = sd
300 300
             elif (len(sd) == 2 or (len(sd) == 5 and sd[2] == '-')) and self.lang_re.match(sd):
301  
-                environ['reddit-prefer-lang'] = sd
302  
-                environ['reddit-domain-prefix'] = sd
  301
+                environ['digg-prefer-lang'] = sd
  302
+                environ['digg-domain-prefix'] = sd
303 303
             else:
304 304
                 sr_redirect = sd
305 305
                 sub_domains.remove(sd)
@@ -318,7 +318,7 @@ def __call__(self, environ, start_response):
318 318
         return self.app(environ, start_response)
319 319
 
320 320
 
321  
-class SubredditMiddleware(object):
  321
+class SubdiggMiddleware(object):
322 322
     sr_pattern = re.compile(r'^/r/([^/]{2,})')
323 323
 
324 324
     def __init__(self, app):
@@ -328,10 +328,10 @@ def __call__(self, environ, start_response):
328 328
         path = environ['PATH_INFO']
329 329
         sr = self.sr_pattern.match(path)
330 330
         if sr:
331  
-            environ['subreddit'] = sr.groups()[0]
  331
+            environ['subdigg'] = sr.groups()[0]
332 332
             environ['PATH_INFO'] = self.sr_pattern.sub('', path) or '/'
333  
-        elif path.startswith("/reddits"):
334  
-            environ['subreddit'] = 'r'
  333
+        elif path.startswith("/diggs"):
  334
+            environ['subdigg'] = 'r'
335 335
         return self.app(environ, start_response)
336 336
 
337 337
 class DomainListingMiddleware(object):
@@ -341,7 +341,7 @@ def __init__(self, app):
341 341
         self.app = app
342 342
 
343 343
     def __call__(self, environ, start_response):
344  
-        if not environ.has_key('subreddit'):
  344
+        if not environ.has_key('subdigg'):
345 345
             path = environ['PATH_INFO']
346 346
             domain = self.domain_pattern.match(path)
347 347
             if domain:
@@ -370,7 +370,7 @@ def __init__(self, app):
370 370
 
371 371
     def __call__(self, environ, start_response):
372 372
         path = environ['PATH_INFO']
373  
-        domain_ext = environ.get('reddit-domain-extension')
  373
+        domain_ext = environ.get('digg-domain-extension')
374 374
         for ext, val in self.extensions.iteritems():
375 375
             if ext == domain_ext or path.endswith('.' + ext):
376 376
                 environ['extension'] = ext
@@ -531,7 +531,7 @@ def make_app(global_conf, full_stack=True, **app_conf):
531 531
     app = SourceViewMiddleware(app)
532 532
 
533 533
     app = DomainListingMiddleware(app)
534  
-    app = SubredditMiddleware(app)
  534
+    app = SubdiggMiddleware(app)
535 535
     app = ExtensionMiddleware(app)
536 536
     app = DomainMiddleware(app)
537 537
 
2  r2/r2/config/rewrites.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
24  r2/r2/config/routing.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -48,16 +48,16 @@ def make_map(global_conf={}, app_conf={}):
48 48
     mc('/traffic', controller='front', action='site_traffic')
49 49
     
50 50
     mc('/about/:location', controller='front', 
51  
-       action='editreddit', location = 'about')
  51
+       action='editdigg', location = 'about')
52 52
     
53  
-    mc('/reddits/create', controller='front', action='newreddit')
54  
-    mc('/reddits/search', controller='front', action='search_reddits')
55  
-    mc('/reddits/login', controller='front', action='login')
56  
-    mc('/reddits/:where', controller='reddits', action='listing',
  53
+    mc('/diggs/create', controller='front', action='newreddit')
  54
+    mc('/diggs/search', controller='front', action='search_reddits')
  55
+    mc('/diggs/login', controller='front', action='login')
  56
+    mc('/diggs/:where', controller='reddits', action='listing',
57 57
        where = 'popular',
58 58
        requirements=dict(where="popular|new|banned"))
59 59
 
60  
-    mc('/reddits/mine/:where', controller='myreddits', action='listing',
  60
+    mc('/diggs/mine/:where', controller='myreddits', action='listing',
61 61
        where='subscriber',
62 62
        requirements=dict(where='subscriber|contributor|moderator'))
63 63
     
@@ -199,18 +199,18 @@ def make_map(global_conf={}, app_conf={}):
199 199
     mc('/doquery', controller='query', action='doquery')
200 200
 
201 201
     mc('/store', controller='redirect', action='redirect',
202  
-       dest='http://store.reddit.com/index.html')
  202
+       dest='http://store.digg.com/index.html')
203 203
     
204 204
     mc('/code', controller='redirect', action='redirect',
205  
-       dest='http://code.reddit.com/')
  205
+       dest='http://code.digg.com/')
206 206
     
207 207
     mc('/mobile', controller='redirect', action='redirect',
208  
-       dest='http://m.reddit.com/')
  208
+       dest='http://m.digg.com/')
209 209
 
210 210
     mc('/authorize_embed', controller = 'front', action = 'authorize_embed')
211 211
     
212 212
     mc("/ads/", controller = "front", action = "ad")
213  
-    mc("/ads/:reddit", controller = "front", action = "ad")
  213
+    mc("/ads/:digg", controller = "front", action = "ad")
214 214
     # This route handles displaying the error page and 
215 215
     # graphics used in the 404/500
216 216
     # error pages. It should likely stay at the top 
@@ -220,7 +220,7 @@ def make_map(global_conf={}, app_conf={}):
220 220
 
221 221
     # these should be near the buttom, because they should only kick
222 222
     # in if everything else fails. It's the attempted catch-all
223  
-    # reddit.com/http://... and reddit.com/34fr, but these redirect to
  223
+    # digg.com/http://... and reddit.com/34fr, but these redirect to
224 224
     # the less-guessy versions at /s/ and /tb/
225 225
     mc('/:linkoid', controller='toolbar', action='linkoid',
226 226
        requirements=dict(linkoid='[0-9a-z]{1,6}'))
8  r2/r2/config/templates.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -36,15 +36,15 @@ def api(type, cls):
36 36
 api('promotedlink',  PromotedLinkJsonTemplate)
37 37
 api('comment',       CommentJsonTemplate)
38 38
 api('message',       MessageJsonTemplate)
39  
-api('subreddit',     SubredditJsonTemplate)
  39
+api('subdigg',     SubredditJsonTemplate)
40 40
 api('morerecursion', MoreCommentJsonTemplate)
41 41
 api('morechildren',  MoreCommentJsonTemplate)
42  
-api('reddit',        RedditJsonTemplate)
  42
+api('digg',        RedditJsonTemplate)
43 43
 api('panestack',     PanestackJsonTemplate)
44 44
 api('listing',       ListingJsonTemplate)
45 45
 api('usertableitem', UserItemJsonTemplate)
46 46
 api('account',       AccountJsonTemplate)
47 47
 
48 48
 api('organiclisting',       OrganicListingJsonTemplate)
49  
-api('reddittraffic', TrafficJsonTemplate)
  49
+api('diggtraffic', TrafficJsonTemplate)
50 50
 api('takedownpane', TakedownJsonTemplate)
2  r2/r2/config/utils.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
4  r2/r2/controllers/__init__.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -33,7 +33,7 @@
33 33
 from listingcontroller import UserController
34 34
 from listingcontroller import CommentsController
35 35
 
36  
-from listingcontroller import MyredditsController
  36
+from listingcontroller import MydiggsController
37 37
 
38 38
 from feedback import FeedbackController
39 39
 from front import FrontController
6  r2/r2/controllers/admin.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -19,8 +19,8 @@
19 19
 # All portions of the code written by CondeNet are Copyright (c) 2006-2009
20 20
 # CondeNet, Inc. All Rights Reserved.
21 21
 ################################################################################
22  
-from r2.controllers.reddit_base import RedditController
23  
-from r2.controllers.reddit_base import base_listing
  22
+from r2.controllers.digg_base import RedditController
  23
+from r2.controllers.digg_base import base_listing
24 24
 
25 25
 from r2.controllers.validator import *
26 26
 from r2.lib.pages import *
74  r2/r2/controllers/api.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -19,7 +19,7 @@
19 19
 # All portions of the code written by CondeNet are Copyright (c) 2006-2009
20 20
 # CondeNet, Inc. All Rights Reserved.
21 21
 ################################################################################
22  
-from reddit_base import RedditController, set_user_cookie
  22
+from digg_base import RedditController, set_user_cookie
23 23
 
24 24
 from pylons.i18n import _
25 25
 from pylons import c, request
@@ -27,7 +27,7 @@
27 27
 from validator import *
28 28
 
29 29
 from r2.models import *
30  
-from r2.models.subreddit import Default as DefaultSR
  30
+from r2.models.subdigg import Default as DefaultSR
31 31
 import r2.models.thing_changes as tc
32 32
 
33 33
 from r2.lib.utils import get_title, sanitize_url, timeuntil, set_last_modified
@@ -49,7 +49,7 @@
49 49
 from r2.lib.media import force_thumbnail, thumbnail_url
50 50
 from r2.lib.comment_tree import add_comment, delete_comment
51 51
 from r2.lib import tracking, sup, cssfilter, emailer
52  
-from r2.lib.subreddit_search import search_reddits
  52
+from r2.lib.subdigg_search import search_reddits
53 53
 
54 54
 from datetime import datetime, timedelta
55 55
 from md5 import md5
@@ -161,7 +161,7 @@ def POST_submit(self, form, jquery, url, selftext, kind, title, save,
161 161
                            errors.SUBREDDIT_NOTALLOWED,
162 162
                            errors.SUBREDDIT_REQUIRED):
163 163
             # checking to get the error set in the form, but we can't
164  
-            # check for rate-limiting if there's no subreddit
  164
+            # check for rate-limiting if there's no subdigg
165 165
             return
166 166
         else:
167 167
             should_ratelimit = sr.should_ratelimit(c.user, 'link')
@@ -340,8 +340,8 @@ def POST_register(self, form, jquery, name, email,
340 340
                 container = VByName('id'))
341 341
     def POST_leavemoderator(self, container):
342 342
         """
343  
-        Handles self-removal as moderator from a subreddit as rendered
344  
-        in the subreddit sidebox on any of that subreddit's pages.
  343
+        Handles self-removal as moderator from a subdigg as rendered
  344
+        in the subdigg sidebox on any of that subreddit's pages.
345 345
         """
346 346
         if container and container.is_moderator(c.user):
347 347
             container.remove_moderator(c.user)
@@ -367,10 +367,10 @@ def POST_leavecontributor(self, container):
367 367
     def POST_unfriend(self, nuser, iuser, container, type):
368 368
         """
369 369
         Handles removal of a friend (a user-user relation) or removal
370  
-        of a user's priviledges from a subreddit (a user-subreddit
  370
+        of a user's priviledges from a subdigg (a user-subreddit
371 371
         relation).  The user can either be passed in by name (nuser)
372 372
         or buy fullname (iuser).  'container' will either be the
373  
-        current user or the subreddit.
  373
+        current user or the subdigg.
374 374
 
375 375
         """
376 376
         # The user who made the request must be an admin or a moderator
@@ -399,7 +399,7 @@ def POST_friend(self, form, jquery, ip, friend,
399 399
                     container, type):
400 400
         """
401 401
         Complement to POST_unfriend: handles friending as well as
402  
-        privilege changes on subreddits.
  402
+        privilege changes on subdiggs.
403 403
         """
404 404
         fn = getattr(container, 'add_' + type)
405 405
 
@@ -527,7 +527,7 @@ def POST_del(self, thing):
527 527
 
528 528
         #expire the item from the sr cache
529 529
         if isinstance(thing, Link):
530  
-            sr = thing.subreddit_slow
  530
+            sr = thing.subdigg_slow
531 531
             expire_hot(sr)
532 532
             if g.use_query_cache:
533 533
                 queries.new_link(thing)
@@ -605,7 +605,7 @@ def POST_comment(self, commentform, jquery, parent, comment, ip):
605 605
             else:
606 606
                 link = Link._byID(parent.link_id, data = True)
607 607
                 parent_comment = parent
608  
-            sr = parent.subreddit_slow
  608
+            sr = parent.subdigg_slow
609 609
             if ((link.is_self and link.author_id == c.user._id)
610 610
                 or not sr.should_ratelimit(c.user, 'comment')):
611 611
                 should_ratelimit = False
@@ -691,7 +691,7 @@ def POST_share(self, shareform, jquery, emails, thing, share_from, reply_to,
691 691
                    message):
692 692
 
693 693
         # remove the ratelimit error if the user's karma is high
694  
-        sr = thing.subreddit_slow
  694
+        sr = thing.subdigg_slow
695 695
         should_ratelimit = sr.should_ratelimit(c.user, 'link')
696 696
         if not should_ratelimit:
697 697
             c.errors.remove((errors.RATELIMIT, 'ratelimit'))
@@ -760,7 +760,7 @@ def POST_vote(self, dir, thing, ip, vote_type):
760 760
 
761 761
             #update relevant caches
762 762
             if isinstance(thing, Link):
763  
-                sr = thing.subreddit_slow
  763
+                sr = thing.subdigg_slow
764 764
                 set_last_modified(c.user, 'liked')
765 765
                 set_last_modified(c.user, 'disliked')
766 766
 
@@ -784,7 +784,7 @@ def POST_vote(self, dir, thing, ip, vote_type):
784 784
                    # nop is safe: handled after auth checks below
785 785
                    stylesheet_contents = nop('stylesheet_contents'),
786 786
                    op = VOneOf('op',['save','preview']))
787  
-    def POST_subreddit_stylesheet(self, form, jquery,
  787
+    def POST_subdigg_stylesheet(self, form, jquery,
788 788
                                   stylesheet_contents = '', op='save'):
789 789
         if not c.site.can_change_stylesheet(c.user):
790 790
             return self.abort(403,'forbidden')
@@ -976,9 +976,9 @@ def POST_upload_sr_img(self, file, header, sponsor, name, form_id):
976 976
                    VModhash(),
977 977
                    VRatelimit(rate_user = True,
978 978
                               rate_ip = True,
979  
-                              prefix = 'create_reddit_'),
  979
+                              prefix = 'create_digg_'),
980 980
                    sr = VByName('sr'),
981  
-                   name = VSubredditName("name"),
  981
+                   name = VSubdiggName("name"),
982 982
                    title = VLength("title", max_length = 100),
983 983
                    domain = VCnameDomain("domain"),
984 984
                    description = VLength("description", max_length = 1000),
@@ -1009,7 +1009,7 @@ def POST_site_admin(self, form, jquery, name, ip, sr, ad_type, ad_file,
1009 1009
             c.errors.add(errors.RATELIMIT, {'time': time})
1010 1010
 
1011 1011
         domain = kw['domain']
1012  
-        cname_sr = domain and Subreddit._by_domain(domain)
  1012
+        cname_sr = domain and Subdigg._by_domain(domain)
1013 1013
         if cname_sr and (not sr or sr != cname_sr):
1014 1014
             c.errors.add(errors.USED_CNAME)
1015 1015
 
@@ -1025,16 +1025,16 @@ def POST_site_admin(self, form, jquery, name, ip, sr, ad_type, ad_file,
1025 1025
         elif (form.has_errors(None, errors.INVALID_OPTION) or
1026 1026
               form.has_errors('description', errors.TOO_LONG)):
1027 1027
             pass
1028  
-        #creating a new reddit
  1028
+        #creating a new digg
1029 1029
         elif not sr:
1030 1030
             #sending kw is ok because it was sanitized above
1031  
-            sr = Subreddit._new(name = name, author_id = c.user._id, ip = ip,
  1031
+            sr = Subdigg._new(name = name, author_id = c.user._id, ip = ip,
1032 1032
                                 **kw)
1033 1033
 
1034 1034
             # will also update search
1035  
-            worker.do(lambda: amqp.add_item('new_subreddit', sr._fullname))
  1035
+            worker.do(lambda: amqp.add_item('new_subdigg', sr._fullname))
1036 1036
 
1037  
-            Subreddit.subscribe_defaults(c.user)
  1037
+            Subdigg.subscribe_defaults(c.user)
1038 1038
             # make sure this user is on the admin list of that site!
1039 1039
             if sr.add_subscriber(c.user):
1040 1040
                 sr._incr('_ups', 1)
@@ -1044,15 +1044,15 @@ def POST_site_admin(self, form, jquery, name, ip, sr, ad_type, ad_file,
1044 1044
             if not c.user_is_admin:
1045 1045
                 VRatelimit.ratelimit(rate_user=True,
1046 1046
                                      rate_ip = True,
1047  
-                                     prefix = "create_reddit_")
  1047
+                                     prefix = "create_digg_")
1048 1048
 
1049  
-        #editting an existing reddit
  1049
+        #editting an existing digg
1050 1050
         elif sr.is_moderator(c.user) or c.user_is_admin:
1051 1051
 
1052 1052
             if c.user_is_admin:
1053 1053
                 sr.ad_type = ad_type
1054 1054
                 if ad_type != "custom":
1055  
-                    ad_file = Subreddit._defaults['ad_file']
  1055
+                    ad_file = Subdigg._defaults['ad_file']
1056 1056
                 sr.ad_file = ad_file
1057 1057
                 sr.sponsorship_url = sponsor_url or None
1058 1058
                 sr.sponsorship_name = sponsor_name or None
@@ -1068,8 +1068,8 @@ def POST_site_admin(self, form, jquery, name, ip, sr, ad_type, ad_file,
1068 1068
 
1069 1069
             #update the domain cache if the domain changed
1070 1070
             if sr.domain != old_domain:
1071  
-                Subreddit._by_domain(old_domain, _update = True)
1072  
-                Subreddit._by_domain(sr.domain, _update = True)
  1071
+                Subdigg._by_domain(old_domain, _update = True)
  1072
+                Subdigg._by_domain(sr.domain, _update = True)
1073 1073
 
1074 1074
             # flag search indexer that something has changed
1075 1075
             tc.changed(sr)
@@ -1157,7 +1157,7 @@ def POST_unhide(self, thing):
1157 1157
     def POST_morechildren(self, form, jquery,
1158 1158
                           link, sort, children, depth, mc_id):
1159 1159
         user = c.user if c.user_is_loggedin else None
1160  
-        if not link or not link.subreddit_slow.can_view(user):
  1160
+        if not link or not link.subdigg_slow.can_view(user):
1161 1161
             return self.abort(403,'forbidden')
1162 1162
 
1163 1163
         if children:
@@ -1209,13 +1209,13 @@ def GET_bookmarklet(self, action, uh, links):
1209 1209
             return self.redirect("/static/css_update.png")
1210 1210
         # unlike most cases, if not already submitted, error.
1211 1211
         elif errors.ALREADY_SUB in c.errors:
1212  
-            # preserve the subreddit if not Default
1213  
-            sr = c.site if not isinstance(c.site, FakeSubreddit) else None
  1212
+            # preserve the subdigg if not Default
  1213
+            sr = c.site if not isinstance(c.site, FakeSubdigg) else None
1214 1214
 
1215 1215
             # check permissions on those links to make sure votes will count
1216  
-            Subreddit.load_subreddits(links, return_dict = False)
  1216
+            Subdigg.load_subreddits(links, return_dict = False)
1217 1217
             user = c.user if c.user_is_loggedin else None
1218  
-            links = [l for l in links if l.subreddit_slow.can_view(user)]
  1218
+            links = [l for l in links if l.subdigg_slow.can_view(user)]
1219 1219
     
1220 1220
             if links:
1221 1221
                 if action in ['like', 'dislike']:
@@ -1268,7 +1268,7 @@ def POST_resetpassword(self, form, jquery, cache_evt, password):
1268 1268
     @noresponse(VUser())
1269 1269
     def POST_noframe(self):
1270 1270
         """
1271  
-        removes the reddit toolbar if that currently the user's preference
  1271
+        removes the digg toolbar if that currently the user's preference
1272 1272
         """
1273 1273
         c.user.pref_frame = False
1274 1274
         c.user._commit()
@@ -1307,7 +1307,7 @@ def POST_subscribe(self, action, sr):
1307 1307
             self._subscribe(sr, action == 'sub')
1308 1308
     
1309 1309
     def _subscribe(self, sr, sub):
1310  
-        Subreddit.subscribe_defaults(c.user)
  1310
+        Subdigg.subscribe_defaults(c.user)
1311 1311
 
1312 1312
         if sub:
1313 1313
             if sr.add_subscriber(c.user):
@@ -1466,7 +1466,7 @@ def POST_tb_commentspanel_hide(self):
1466 1466
 
1467 1467
     @validatedForm(promoted = VByName('ids', thing_cls = Link,
1468 1468
                                       multiple = True),
1469  
-                   sponsorships = VByName('ids', thing_cls = Subreddit,
  1469
+                   sponsorships = VByName('ids', thing_cls = Subdigg,
1470 1470
                                           multiple = True))
1471 1471
     def POST_onload(self, form, jquery, promoted, sponsorships, *a, **kw):
1472 1472
         def add_tracker(dest, where, what):
@@ -1492,10 +1492,10 @@ def add_tracker(dest, where, what):
1492 1492
 
1493 1493
 
1494 1494
     @json_validate(query = nop('query'))
1495  
-    def POST_search_reddit_names(self, query):
  1495
+    def POST_search_digg_names(self, query):
1496 1496
         names = []
1497 1497
         if query:
1498  
-            names = search_reddits(query)
  1498
+            names = search_diggs(query)
1499 1499
 
1500 1500
         return {'names': names}
1501 1501
 
4  r2/r2/controllers/awards.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -20,7 +20,7 @@
20 20
 # CondeNet, Inc. All Rights Reserved.
21 21
 ################################################################################
22 22
 from pylons import request, g
23  
-from reddit_base import RedditController
  23
+from digg_base import RedditController
24 24
 from r2.lib.pages import AdminPage, AdminAwards
25 25
 from r2.lib.pages import AdminAwardGive, AdminAwardWinners
26 26
 from validator import *
16  r2/r2/controllers/buttons.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -19,7 +19,7 @@
19 19
 # All portions of the code written by CondeNet are Copyright (c) 2006-2009
20 20
 # CondeNet, Inc. All Rights Reserved.
21 21
 ################################################################################
22  
-from reddit_base import RedditController
  22
+from digg_base import RedditController
23 23
 from r2.lib.pages import Button, ButtonNoBody, ButtonEmbed, ButtonLite, \
24 24
     ButtonDemoPanel, WidgetDemoPanel, Bookmarklets, BoringPage
25 25
 from r2.lib.pages.things import wrap_links
@@ -44,7 +44,7 @@ def get_wrapped_link(self, url, link = None, wrapper = None):
44 44
             if link:
45 45
                 links = [link]
46 46
             else:
47  
-                sr = None if isinstance(c.site, FakeSubreddit) else c.site
  47
+                sr = None if isinstance(c.site, FakeSubdigg) else c.site
48 48
                 try:
49 49
                     links = tup(Link._by_url(url, sr))
50 50
                 except NotFound:
@@ -63,7 +63,7 @@ def get_wrapped_link(self, url, link = None, wrapper = None):
63 63
             return links
64 64
             # note: even if _by_url successed or a link was passed in,
65 65
             # it is possible link_listing.things is empty if the
66  
-            # link(s) is/are members of a private reddit
  66
+            # link(s) is/are members of a private digg
67 67
             # return the link with the highest score (if more than 1)
68 68
         except:
69 69
             #we don't want to return 500s in other people's pages.
@@ -90,8 +90,8 @@ def GET_button_content(self, url, title, css, vote, newwindow, width, link):
90 90
             return self.redirect(request.path + query_string(request.GET))
91 91
 
92 92
         #disable css hack 
93  
-        if (css != 'http://blog.wired.com/css/redditsocial.css' and
94  
-            css != 'http://www.wired.com/css/redditsocial.css'): 
  93
+        if (css != 'http://blog.wired.com/css/diggsocial.css' and
  94
+            css != 'http://www.wired.com/css/diggsocial.css'): 
95 95
             css = None 
96 96
 
97 97
         if link:
@@ -173,13 +173,13 @@ def GET_button_demo_page(self):
173 173
         # no buttons for domain listings -> redirect to top level
174 174
         if isinstance(c.site, DomainSR):
175 175
             return self.redirect('/buttons')
176  
-        return BoringPage(_("reddit buttons"),
  176
+        return BoringPage(_("digg buttons"),
177 177
                           show_sidebar = False, 
178 178
                           content=ButtonDemoPanel()).render()
179 179
 
180 180
 
181 181
     def GET_widget_demo_page(self):
182  
-        return BoringPage(_("reddit widget"),
  182
+        return BoringPage(_("digg widget"),
183 183
                           show_sidebar = False, 
184 184
                           content=WidgetDemoPanel()).render()
185 185
 
4  r2/r2/controllers/captcha.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -19,7 +19,7 @@
19 19
 # All portions of the code written by CondeNet are Copyright (c) 2006-2009
20 20
 # CondeNet, Inc. All Rights Reserved.
21 21
 ################################################################################
22  
-from reddit_base import RedditController
  22
+from digg_base import RedditController
23 23
 import StringIO
24 24
 import r2.lib.captcha as captcha
25 25
 from pylons import c
12  r2/r2/controllers/embed.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -19,7 +19,7 @@
19 19
 # All portions of the code written by CondeNet are Copyright (c) 2006-2009
20 20
 # CondeNet, Inc. All Rights Reserved.
21 21
 ################################################################################
22  
-from reddit_base import RedditController, proxyurl
  22
+from digg_base import RedditController, proxyurl
23 23
 from r2.lib.template_helpers import get_domain
24 24
 from r2.lib.pages import Embed, BoringPage, HelpPage
25 25
 from r2.lib.filters import websafe, SC_OFF, SC_ON
@@ -46,7 +46,7 @@ def rendercontent(self, input, fp):
46 46
             edit_text = _('edit this page')
47 47
             yes_you_can = _("yes, it's okay!")
48 48
             read_first = _('just read this first.')
49  
-            url = "http://code.reddit.com/wiki" + websafe(fp) + "?action=edit"
  49
+            url = "http://code.digg.com/wiki" + websafe(fp) + "?action=edit"
50 50
 
51 51
             edittag = """
52 52
             <div class="editlink">
@@ -67,9 +67,9 @@ def rendercontent(self, input, fp):
67 67
 
68 68
     def renderurl(self):
69 69
 
70  
-        # Needed so http://reddit.com/help/ works
  70
+        # Needed so http://digg.com/help/ works
71 71
         fp = request.path.rstrip("/")
72  
-        u = "http://code.reddit.com/wiki" + fp + '?stripped=1'
  72
+        u = "http://code.digg.com/wiki" + fp + '?stripped=1'
73 73
 
74 74
         g.log.debug("Pulling %s for help" % u)
75 75
 
@@ -86,5 +86,5 @@ def renderurl(self):
86 86
 
87 87
     def GET_blog(self):
88 88
         return self.redirect("http://blog.%s/" %
89  
-                             get_domain(cname = False, subreddit = False,
  89
+                             get_domain(cname = False, subdigg = False,
90 90
                                         no_www = True))
20  r2/r2/controllers/error.py
... ...
@@ -1,7 +1,7 @@
1 1
 # The contents of this file are subject to the Common Public Attribution
2 2
 # License Version 1.0. (the "License"); you may not use this file except in
3 3
 # compliance with the License. You may obtain a copy of the License at
4  
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
  4
+# http://code.digg.com/LICENSE. The License is based on the Mozilla Public
5 5
 # License Version 1.1, but Sections 14 and 15 have been added to cover use of
6 6
 # software over a computer network and provide for limited attribution for the
7 7
 # Original Developer. In addition, Exhibit A has been modified to be consistent
@@ -31,8 +31,8 @@
31 31
 try:
32 32
     # place all r2 specific imports in here.  If there is a code error, it'll get caught and
33 33
     # the stack trace won't be presented to the user in production
34  
-    from reddit_base import RedditController
35  
-    from r2.models.subreddit import Default, Subreddit
  34
+    from digg_base import RedditController
  35
+    from r2.models.subdigg import Default, Subreddit
36 36
     from r2.models.link import Link
37 37
     from r2.lib import pages
38 38
     from r2.lib.strings import strings, rand_strings
@@ -47,7 +47,7 @@
47 47
         import os
48 48
         os._exit(1)
49 49