[Lisppaste-cvs] CVS update: lisppaste2/README.lisp lisppaste2/irc-notification.lisp lisppaste2/persistent-pastes.lisp lisppaste2/variable.lisp lisppaste2/web-server.lisp
Brian Mastenbrook
bmastenbrook at common-lisp.net
Wed Oct 20 20:37:52 UTC 2004
Update of /project/lisppaste/cvsroot/lisppaste2
In directory common-lisp.net:/tmp/cvs-serv12377
Modified Files:
README.lisp irc-notification.lisp persistent-pastes.lisp
variable.lisp web-server.lisp
Log Message:
Fixes for IRC-less mode
Date: Wed Oct 20 22:37:50 2004
Author: bmastenbrook
Index: lisppaste2/README.lisp
diff -u lisppaste2/README.lisp:1.14 lisppaste2/README.lisp:1.15
--- lisppaste2/README.lisp:1.14 Wed Oct 20 22:22:13 2004
+++ lisppaste2/README.lisp Wed Oct 20 22:37:50 2004
@@ -1,4 +1,4 @@
-;;;; $Id: README.lisp,v 1.14 2004/10/20 20:22:13 bmastenbrook Exp $
+;;;; $Id: README.lisp,v 1.15 2004/10/20 20:37:50 bmastenbrook Exp $
;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/README.lisp,v $
;;;; See the LICENSE file for licensing information.
@@ -35,7 +35,7 @@
(lisppaste:start-lisppaste)
#-lisppaste-no-irc
-(lisppaste:start-irc-notification)
+(lisppaste:start-irc-notification
:channels '("#lisp" "#scheme" "#opendarwin" "#macdev" "#fink"
"#jedit" "#dylan" "#emacs" "#xemacs" "#colloquy" "#adium"
"#growl" "#chicken" "#quicksilver" "#svn" "#slate"
Index: lisppaste2/irc-notification.lisp
diff -u lisppaste2/irc-notification.lisp:1.1 lisppaste2/irc-notification.lisp:1.2
--- lisppaste2/irc-notification.lisp:1.1 Wed Oct 20 22:22:13 2004
+++ lisppaste2/irc-notification.lisp Wed Oct 20 22:37:50 2004
@@ -1,4 +1,4 @@
-;;;; $Id: irc-notification.lisp,v 1.1 2004/10/20 20:22:13 bmastenbrook Exp $
+;;;; $Id: irc-notification.lisp,v 1.2 2004/10/20 20:37:50 bmastenbrook Exp $
;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/irc-notification.lisp,v $
;;;; See the LICENSE file for licensing information.
@@ -49,7 +49,7 @@
:server server
:port port)))
(setf *connection* connection)
- (setf *channels* channels)
+ (setf *channels* (nconc *channels* channels))
(setf *nickname* nickname)
(mapcar #'(lambda (channel) (irc:join connection channel)) channels)
(add-irc-hook nickname)
Index: lisppaste2/persistent-pastes.lisp
diff -u lisppaste2/persistent-pastes.lisp:1.13 lisppaste2/persistent-pastes.lisp:1.14
--- lisppaste2/persistent-pastes.lisp:1.13 Tue Jul 27 20:47:10 2004
+++ lisppaste2/persistent-pastes.lisp Wed Oct 20 22:37:50 2004
@@ -50,7 +50,6 @@
*paste-path*))
(defun paste-write-xml (paste stream)
- (ensure-directories-exist *paste-path*)
(write-string "<?xml version=\"1.0\"?>" stream)
(write-string (s-xml:print-xml-string (paste-lxml paste) :pretty t) stream)
(mapc #'(lambda (ann)
@@ -59,6 +58,7 @@
(paste-annotations paste)))
(defun paste-write-xml-to-file (paste)
+ (ensure-directories-exist *paste-path*)
(with-open-file (s (paste-xml-file paste) :direction :output :if-exists :supersede)
(paste-write-xml paste s)))
Index: lisppaste2/variable.lisp
diff -u lisppaste2/variable.lisp:1.32 lisppaste2/variable.lisp:1.33
--- lisppaste2/variable.lisp:1.32 Wed Oct 20 22:22:13 2004
+++ lisppaste2/variable.lisp Wed Oct 20 22:37:50 2004
@@ -1,4 +1,4 @@
-;;;; $Id: variable.lisp,v 1.32 2004/10/20 20:22:13 bmastenbrook Exp $
+;;;; $Id: variable.lisp,v 1.33 2004/10/20 20:37:50 bmastenbrook Exp $
;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/variable.lisp,v $
;;;; See the LICENSE file for licensing information.
@@ -23,12 +23,12 @@
(in-package :lisppaste)
-(defparameter *internal-http-port* 8080
+(defparameter *internal-http-port* 8081
"Port lisppaste's araneida will listen on for requests from Apache.")
-(defparameter *external-http-port* 80
+(defparameter *external-http-port* 8081
"Port lisppaste's araneida will listen on for requests from remote clients.")
-(defparameter *paste-site-name* "paste.lisp.org"
+(defparameter *paste-site-name* "www.unmutual.info"
"Website we are running on (used for creating links).")
(defparameter *paste-external-url*
@@ -37,7 +37,7 @@
:host *paste-site-name*
;;; comment out this next line when running
;;; behind a proxying apache
- #| :port *external-http-port* |#
+ :port *external-http-port*
) "/"))
(defparameter *old-url* (araneida:merge-url
Index: lisppaste2/web-server.lisp
diff -u lisppaste2/web-server.lisp:1.67 lisppaste2/web-server.lisp:1.68
--- lisppaste2/web-server.lisp:1.67 Wed Oct 20 21:56:54 2004
+++ lisppaste2/web-server.lisp Wed Oct 20 22:37:50 2004
@@ -1,4 +1,4 @@
-;;;; $Id: web-server.lisp,v 1.67 2004/10/20 19:56:54 bmastenbrook Exp $
+;;;; $Id: web-server.lisp,v 1.68 2004/10/20 20:37:50 bmastenbrook Exp $
;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/web-server.lisp,v $
;;;; See the LICENSE file for licensing information.
@@ -215,7 +215,7 @@
users can paste code, and the URL of the paste is announced on the
desired channel. Lisppaste is an advanced pastebot running on the IRC
server "
- ,(encode-for-pre (irc:server-name *connection*))
+ ,(encode-for-pre *irc-network-name*)
" which has many unique features."
,@(if *no-channel-pastes*
'((p) " It also allows pastes which are not announced on any channel, which
@@ -855,7 +855,7 @@
,@(unless (and annotate
*no-channel-pastes*
(string-equal (paste-channel annotate) "None"))
- `("The paste will be announced on the selected channel on " ,(irc:server-name *connection*) ". "))
+ `("The paste will be announced on the selected channel on " ,*irc-network-name* ". "))
,@(if annotate
`("This paste will be used to annotate "
(b
@@ -933,7 +933,7 @@
`(p ,(if annotate "Your annotation should be available at " "Your paste should be available at ") (b ((a :href ,url) ,url))
,@(unless (and *no-channel-pastes*
(string-equal channel "none"))
- `(", and was also sent to " ,channel " at " ,(irc:server-name *connection*))) ".")
+ `(", and was also sent to " ,channel " at " ,*irc-network-name*)) ".")
`((form :method post :action ,(araneida:urlstring *new-paste-url*))
((input :type hidden :name "annotate" :value ,(prin1-to-string paste-number)))
(table
More information about the Lisppaste-cvs
mailing list