Unneeded line removed / improved status handling

diff --git a/src/Protocol/ATProtocol.php b/src/Protocol/ATProtocol.php
index c4088624eaea8b80499bda0464c5f9dd267ee612..3ab613e4f850849d23a7e5f9c302ff98bacc6663 100644 (file)
--- a/src/Protocol/ATProtocol.php
+++ b/src/Protocol/ATProtocol.php
@@ -129,7 +129,17 @@ final class ATProtocol
                }
 
                $data = $this->get($pds . '/xrpc/' . $url, [HttpClientOptions::HEADERS => $headers]);
-               $this->pConfig->set($uid, 'bluesky', 'status', is_null($data) ? self::STATUS_API_FAIL : self::STATUS_SUCCESS);
+               if (empty($data) || (!empty($data->code) && ($data->code < 200 || $data->code >= 400))) {
+                       $this->pConfig->set($uid, 'bluesky', 'status', self::STATUS_API_FAIL);
+                       if (!empty($data->message)) {
+                               $this->pConfig->set($uid, 'bluesky', 'status-message', $data->message);
+                       } elseif (!empty($data->code)) {
+                               $this->pConfig->set($uid, 'bluesky', 'status-message', 'Error Code: ' . $data->code);
+                       }
+               } elseif (!empty($data)) {
+                       $this->pConfig->set($uid, 'bluesky', 'status', self::STATUS_SUCCESS);
+                       $this->pConfig->set($uid, 'bluesky', 'status-message', '');
+               }
                return $data;
        }
 
@@ -156,6 +166,9 @@ final class ATProtocol
                                return null;
                        }
                        $data->code = $curlResult->getReturnCode();
+               } elseif (($curlResult->getReturnCode() < 200) || ($curlResult->getReturnCode() >= 400)) {
+                       $this->logger->notice('Unexpected return code', ['url' => $url, 'code' => $curlResult->getReturnCode(), 'error' => $data ?: $curlResult->getBodyString()]);
+                       $data->code = $curlResult->getReturnCode();
                }
 
                Item::incrementInbound(Protocol::BLUESKY);
@@ -198,6 +211,7 @@ final class ATProtocol
                } catch (\Exception $e) {
                        $this->logger->notice('Exception on post', ['exception' => $e]);
                        $this->pConfig->set($uid, 'bluesky', 'status', self::STATUS_API_FAIL);
+                       $this->pConfig->set($uid, 'bluesky', 'status-message', $e->getMessage());
                        return null;
                }
 
@@ -206,6 +220,11 @@ final class ATProtocol
                        $this->logger->notice('API Error', ['url' => $url, 'code' => $curlResult->getReturnCode(), 'error' => $data ?: $curlResult->getBodyString()]);
                        if (!$data) {
                                $this->pConfig->set($uid, 'bluesky', 'status', self::STATUS_API_FAIL);
+                               if (!empty($data->message)) {
+                                       $this->pConfig->set($uid, 'bluesky', 'status-message', $data->message);
+                               } elseif (!empty($data->code)) {
+                                       $this->pConfig->set($uid, 'bluesky', 'status-message', 'Error Code: ' . $data->code);
+                               }
                                return null;
                        }
                        $data->code = $curlResult->getReturnCode();
@@ -213,8 +232,14 @@ final class ATProtocol
 
                if (!empty($data->code) && ($data->code >= 200) && ($data->code < 400)) {
                        $this->pConfig->set($uid, 'bluesky', 'status', self::STATUS_SUCCESS);
+                       $this->pConfig->set($uid, 'bluesky', 'status-message', '');
                } else {
                        $this->pConfig->set($uid, 'bluesky', 'status', self::STATUS_API_FAIL);
+                       if (!empty($data->message)) {
+                               $this->pConfig->set($uid, 'bluesky', 'status-message', $data->message);
+                       } elseif (!empty($data->code)) {
+                               $this->pConfig->set($uid, 'bluesky', 'status-message', 'Error Code: ' . $data->code);
+                       }
                }
                return $data;
        }
@@ -502,10 +527,6 @@ final class ATProtocol
                $data = $this->post($uid, '/xrpc/com.atproto.server.refreshSession', '', ['Authorization' => ['Bearer ' . $token]]);
                if (empty($data) || empty($data->accessJwt)) {
                        $this->logger->debug('Refresh failed', ['return' => $data]);
-                       $password = $this->pConfig->get($uid, 'bluesky', 'password');
-                       if (!empty($password)) {
-                               return $this->createUserToken($uid, $password);
-                       }
                        $this->pConfig->set($uid, 'bluesky', 'status', self::STATUS_TOKEN_FAIL);
                        return '';
                }
@@ -542,6 +563,7 @@ final class ATProtocol
                $this->pConfig->set($uid, 'bluesky', 'refresh_token', $data->refreshJwt);
                $this->pConfig->set($uid, 'bluesky', 'token_created', time());
                $this->pConfig->set($uid, 'bluesky', 'status', self::STATUS_TOKEN_OK);
+               $this->pConfig->set($uid, 'bluesky', 'status-message', '');
                return $data->accessJwt;
        }
 }

diff --git a/src/Protocol/ATProtocol/Actor.php b/src/Protocol/ATProtocol/Actor.php
index a45bdd297829f9319ef02f873c46d161d1351a2d..882f40eab9b4a51a62f7467d30e415911ad73f60 100755 (executable)
--- a/src/Protocol/ATProtocol/Actor.php
+++ b/src/Protocol/ATProtocol/Actor.php
@@ -1,5 +1,5 @@
-#!/usr/bin/env php
 <?php
+
 /**
  * Copyright (C) 2010-2024, the Friendica project
  * SPDX-FileCopyrightText: 2010-2024 the Friendica project

diff --git a/src/Protocol/ATProtocol/Jetstream.php b/src/Protocol/ATProtocol/Jetstream.php
index 78b84f27fb55313fdd43ef4cbdc9e87f1678d4c0..64a8397ddfa6f05cb1630e62a8dfe6ee763c9419 100755 (executable)
--- a/src/Protocol/ATProtocol/Jetstream.php
+++ b/src/Protocol/ATProtocol/Jetstream.php
@@ -1,5 +1,5 @@
-#!/usr/bin/env php
 <?php
+
 /**
  * Copyright (C) 2010-2024, the Friendica project
  * SPDX-FileCopyrightText: 2010-2024 the Friendica project

diff --git a/src/Protocol/ATProtocol/Processor.php b/src/Protocol/ATProtocol/Processor.php
index 852d21919db35bf6b1dc6ac4536a7345a48c0d5a..4673a730bd6b25c1db03a8d9f7fc631465cdc467 100755 (executable)
--- a/src/Protocol/ATProtocol/Processor.php
+++ b/src/Protocol/ATProtocol/Processor.php
@@ -1,5 +1,5 @@
-#!/usr/bin/env php
 <?php
+
 /**
  * Copyright (C) 2010-2024, the Friendica project
  * SPDX-FileCopyrightText: 2010-2024 the Friendica project