Contact follow and unfollow workd partially

[friendica.git] / src / Util / HTTPSignature.php

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index c3a45205c37bd9326ada56d9955e8494df79312f..911de4308e5f7eb0b371f6c277f48d88386232e8 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -6,8 +6,7 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Config;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 /**
  * @brief Implements HTTP Signatures per draft-cavage-http-signatures-07.
@@ -126,6 +125,8 @@ class HTTPSignature
                        $key = $key($sig_block['keyId']);
                }
 
+               logger('Got keyID ' . $sig_block['keyId']);
+
                // We don't use Activity Pub at the moment.
 //             if (!$key) {
 //                     $result['signer'] = $sig_block['keyId'];
@@ -179,12 +180,12 @@ class HTTPSignature
        private static function getActivitypubKey($id)
        {
                if (strpos($id, 'acct:') === 0) {
-                       $contact = dba::selectFirst('contact', ['pubkey'], ['uid' => 0, 'addr' => str_replace('acct:', '', $id)]);
+                       $contact = DBA::selectFirst('contact', ['pubkey'], ['uid' => 0, 'addr' => str_replace('acct:', '', $id)]);
                } else {
-                       $contact = dba::selectFirst('contact', ['pubkey'], ['id' => $id, 'network' => 'activitypub']);
+                       $contact = DBA::selectFirst('contact', ['pubkey'], ['id' => $id, 'network' => 'activitypub']);
                }
 
-               if (DBM::is_result($contact)) {
+               if (DBA::isResult($contact)) {
                        return $contact['pubkey'];
                }