More sensical profile::getUri()

[quix0rs-gnu-social.git] / lib / oauthstore.php

diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index b04bcbb8b29896a922ceb651587fccdb7f9d0f1d..eabe37f9fa4a944d76f99c91c9a57de69c6c0f23 100644 (file)
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -65,7 +65,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
     {
         $n = new Nonce();
         $n->consumer_key = $consumer->key;
-        $n->ts = $timestamp;
+        $n->ts = common_sql_date($timestamp);
         $n->nonce = $nonce;
         if ($n->find(true)) {
             return true;
@@ -359,11 +359,9 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $notice = Notice::saveNew($author->id,
                                   $omb_notice->getContent(),
                                   'omb',
-                                  false,
-                                  null,
-                                  $omb_notice->getIdentifierURI());
+                                  array('is_local' => Notice::REMOTE_OMB,
+                                        'uri' => $omb_notice->getIdentifierURI()));
 
-        common_broadcast_notice($notice, true);
     }
 
     /**
@@ -463,6 +461,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $subscriber = $this->_getAnyProfile($subscriber_uri);
 
         if (!$subscriber->hasRight(Right::SUBSCRIBE)) {
+            common_log(LOG_INFO, __METHOD__ . ": remote subscriber banned ($subscriber_uri subbing to $subscribed_user_uri)");
             return _('You have been banned from subscribing.');
         }