Merge pull request #25 from tmolnar0831/development-2.0

Fixing the newline error and adding region to weather answer 2.0.2

photter.asd

@@ -1,9 +1,10 @@
 (asdf:defsystem "photter"
   :description "Photter IRC BOT"
   :author "Tamas Molnar"
-  :version "2.0.1"
+  :version "2.0.2"
   :license "MIT"
   :depends-on ("cl-irc"
+               "cl-ppcre"
                "split-sequence"
                "drakma"
                "cl-json"

photter.lisp

@@ -10,7 +10,7 @@
 
 (in-package :photter)
 
-(defparameter *version* "2.0.1")
+(defparameter *version* "2.0.2")
 (defvar *nick* "photter-dev")
 (defvar *server* "irc.freenode.net")
 (defvar *channel* "#iron-bottest-room")
@@ -22,9 +22,10 @@
 
 (defun answer (answer source destination)
   "General function for sending messages"
-  (if (string-equal destination *nick*) 
-      (irc:privmsg *connection* source (princ-to-string answer))
-      (irc:privmsg *connection* destination (princ-to-string answer))))
+  (let ((text (cl-ppcre:regex-replace-all "(\\n)" answer " ")))
+    (if (string-equal destination *nick*)
+        (irc:privmsg *connection* source text)
+        (irc:privmsg *connection* destination text))))
 
 (defun process-message-params (message)
   (split-sequence:split-sequence #\Space (first message)))

weather-checker.lisp

@@ -64,8 +64,9 @@
 
 (defun formatted-weather-data (data)
   "Return a formatted answer string"
-  (format nil "~A, ~A, ~A, ~A°C, feels like ~A°C, wind ~Akph ~A, precipitation ~Amm, humidity ~A%, UV ~A"
+  (format nil "~A, ~A, ~A, ~A, ~A°C, feels like ~A°C, wind ~Akph ~A, precipitation ~Amm, humidity ~A%, UV ~A"
           (aget (aget data :location) :name)
+          (aget (aget data :location) :region)
           (aget (aget data :location) :country)
           (aget (aget (aget data :current) :condition) :text)
           (aget (aget data :current) :temp--c)