Quote URL on dupe search and better logging on upgrade

[quix0rs-gnu-social.git] / scripts / importtwitteratom.php

diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php
old mode 100644 (file)
new mode 100755 (executable)
index c12e3b9..2a4cb7f
--- a/scripts/importtwitteratom.php
+++ b/scripts/importtwitteratom.php
@@ -34,31 +34,6 @@ import an Atom feed from Twitter as notices by a user
 END_OF_IMPORTTWITTERATOM_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
-require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
-
-function getUser()
-{
-    $user = null;
-
-    if (have_option('i', 'id')) {
-        $id = get_option_value('i', 'id');
-        $user = User::staticGet('id', $id);
-        if (empty($user)) {
-            throw new Exception("Can't find user with id '$id'.");
-        }
-    } else if (have_option('n', 'nickname')) {
-        $nickname = get_option_value('n', 'nickname');
-        $user = User::staticGet('nickname', $nickname);
-        if (empty($user)) {
-            throw new Exception("Can't find user with nickname '$nickname'");
-        }
-    } else {
-        show_help();
-        exit(1);
-    }
-
-    return $user;
-}
 
 function getAtomFeedDocument()
 {
@@ -106,14 +81,9 @@ function importActivityStream($user, $doc)
         if (!have_option('q', 'quiet')) {
             print $activity->content . "\n";
         }
-        $html = getTweetHtml($object->link);
-
-        $config = array('safe' => 1,
-                        'deny_attribute' => 'class,rel,id,style,on*');
-
-        $html = htmLawed($html, $config);
+        $html = common_purify(getTweetHtml($object->link));
 
-        $content = html_entity_decode(strip_tags($html));
+        $content = html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8');
 
         $notice = Notice::saveNew($user->id,
                                   $content,
@@ -132,7 +102,7 @@ function getTweetHtml($url)
     try {
         $client = new HTTPClient();
         $response = $client->get($url);
-    } catch (HTTP_Request2_Exception $e) {
+    } catch (Exception $e) {
         print "ERROR: HTTP response " . $e->getMessage() . "\n";
         return false;
     }