diff --git a/README.md b/README.md
index d6dd955..13c01ed 100644
--- a/README.md
+++ b/README.md
@@ -58,3 +58,12 @@ There are 2 methods to run Fediplan
### Credits
Docker configurations are based on [github.com/TrafeX/docker-php-nginx](https://github.com/TrafeX/docker-php-nginx)
+
+See: [Download Composer](https://getcomposer.org/download/)
+
+**3 - Public directory:**
+
+Your site needs to target /path/to/FediPlan/public
+
+
+#### Support My work at [fedilab.app](https://fedilab.app/page/donations/)
\ No newline at end of file
diff --git a/src/Services/Curl.php b/src/Services/Curl.php
index e5a6161..c251bb2 100644
--- a/src/Services/Curl.php
+++ b/src/Services/Curl.php
@@ -286,52 +286,21 @@ class Curl
*
* @param string $url The url to make the post request
* @param array $data Post data to pass to the url
- * @param bool $payload
* @return self
*/
- public function post($url, $data = array(), $payload = false)
+ public function post($url, $data = array())
{
- if (!empty($data)) {
- if ($payload === false) {
- // Check if the url has not already been modified
- $url .= strpos($url, '?') !== false ? '&' : '?';
- $url .= http_build_query($data);
- } else {
- $this->preparePayload($data);
- }
- }
-
+ $fields_string = http_build_query($data);
+ $payload = json_encode( $data );
$this->setOpt(CURLOPT_URL, $url);
+ $this->setOpt(CURLOPT_RETURNTRANSFER, true);
+ $this->setOpt(CURLOPT_POST, true);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'POST');
+ $this->setOpt(CURLOPT_POSTFIELDS, $payload);
$this->exec();
return $this;
}
- /**
- * @param array|object|string $data
- */
- protected function preparePayload($data)
- {
- $this->setOpt(CURLOPT_POST, true);
-
- if (is_array($data) || is_object($data)) {
- $skip = false;
- foreach ($data as $key => $value) {
- // If a value is an instance of CurlFile skip the http_build_query
- // see issue https://github.com/php-mod/curl/issues/46
- // suggestion from: https://stackoverflow.com/a/36603038/4611030
- if ($value instanceof CurlFile) {
- $skip = true;
- }
- }
-
- if (!$skip) {
- $data = http_build_query($data);
- }
- }
-
- $this->setOpt(CURLOPT_POSTFIELDS, $data);
- }
/**
* Make a put request with optional data.
@@ -340,21 +309,16 @@ class Curl
*
* @param string $url The url to make the put request
* @param array $data Optional data to pass to the $url
- * @param bool $payload Whether the data should be transmitted trough payload or as get parameters of the string
* @return self
*/
- public function put($url, $data = array(), $payload = false)
+ public function put($url, $data = array())
{
- if (!empty($data)) {
- if ($payload === false) {
- $url .= '?' . http_build_query($data);
- } else {
- $this->preparePayload($data);
- }
- }
+ $fields_string = http_build_query($data);
$this->setOpt(CURLOPT_URL, $url);
+ $this->setOpt(CURLOPT_POST, 1);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'PUT');
+ $this->setOpt(CURLOPT_POSTFIELDS, $fields_string);
$this->exec();
return $this;
}
@@ -366,21 +330,16 @@ class Curl
*
* @param string $url The url to make the patch request
* @param array $data Optional data to pass to the $url
- * @param bool $payload Whether the data should be transmitted trough payload or as get parameters of the string
* @return self
*/
- public function patch($url, $data = array(), $payload = false)
+ public function patch($url, $data = array())
{
- if (!empty($data)) {
- if ($payload === false) {
- $url .= '?' . http_build_query($data);
- } else {
- $this->preparePayload($data);
- }
- }
+ $fields_string = http_build_query($data);
$this->setOpt(CURLOPT_URL, $url);
+ $this->setOpt(CURLOPT_POST, 1);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'PATCH');
+ $this->setOpt(CURLOPT_POSTFIELDS, $fields_string);
$this->exec();
return $this;
}
@@ -392,21 +351,16 @@ class Curl
*
* @param string $url The url to make the delete request
* @param array $data Optional data to pass to the $url
- * @param bool $payload Whether the data should be transmitted trough payload or as get parameters of the string
* @return self
*/
- public function delete($url, $data = array(), $payload = false)
+ public function delete($url, $data = array())
{
- if (!empty($data)) {
- if ($payload === false) {
- $url .= '?' . http_build_query($data);
- } else {
- $this->preparePayload($data);
- }
- }
+ $fields_string = http_build_query($data);
$this->setOpt(CURLOPT_URL, $url);
+ $this->setOpt(CURLOPT_POST, 1);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'DELETE');
+ $this->setOpt(CURLOPT_POSTFIELDS, $fields_string);
$this->exec();
return $this;
}
diff --git a/src/Services/Mastodon_api.php b/src/Services/Mastodon_api.php
index fcea41d..de8adb9 100644
--- a/src/Services/Mastodon_api.php
+++ b/src/Services/Mastodon_api.php
@@ -195,65 +195,27 @@ class Mastodon_api
$data = array();
// set USERAGENT
- if (isset($_SERVER['HTTP_USER_AGENT'])) {
- $parameters['headers']['User-Agent'] = $_SERVER['HTTP_USER_AGENT'];
- } else {
- // default IE11
- $parameters['headers']['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko';
- }
+ $parameters['headers']['User-Agent'] = 'Mozilla/5.0 (X11; Linux i686; rv:126.0) Gecko/20100101 Firefox/126.0';
+
$curl = new Curl();
$response = null;
-
+ if (isset($parameters["method"]) && $parameters['method'] == "POST") {
+ $parameters['headers']['content-type'] = 'application/json';
+ }
foreach ($parameters['headers'] as $key => $value) {
$curl->setHeader($key, $value);
}
-
- //Special treatment for sending media when editing profile
- if (isset($parameters['body']['media'])) {
- $fields = [$parameters['body']['media']['name'] => new CURLFile($parameters['body']['media']['path'], $parameters['body']['media']['mimetype'], $parameters['body']['media']['filename'])];
- $curl->setOpt(CURLOPT_POSTFIELDS, $fields);
- }
-
- // Since Curl does not let us upload media_ids as we wish, we had to pass it through the url, directly.
- if (isset($parameters['body']['media_ids'])) {
- $url .= strpos($url, '?') !== false ? '' : '?';
-
- foreach ($parameters['body']['media_ids'] as $key => $value) {
- $url .= 'media_ids[]=' . (int)$value . '&';
- }
- $url = substr($url, 0, -1);
-
- unset($parameters['body']['media_ids']);
- }
- if (isset($parameters['body']['poll']['options'])) {
- $url .= strpos($url, '?') !== false ? '' : '?';
- foreach ($parameters['body']['poll']['options'] as $key => $value) {
- $url .= 'poll[options][]=' . urlencode($value) . '&';
- }
- $url = substr($url, 0, -1);
-
- unset($parameters['body']['poll']['options']);
- }
- //Special treatment for filtering notifications
- if (isset($parameters['body']['exclude_types[]']) && $parameters['method'] == "GET") {
- $url .= "?";
- foreach ($parameters['body']['exclude_types[]'] as $key => $value) {
- $url .= "exclude_types[]=" . $value . "&";
- }
- if (isset($parameters['body']['max_id']))
- $url .= "&max_id=" . $parameters['body']['max_id'];
- $parameters['body'] = [];
- }
- if (isset($parameters["method"]) && $parameters['method'] == "POST")
+ if (isset($parameters["method"]) && $parameters['method'] == "POST") {
$response = $curl->post($url, $parameters['body']);
- else if (isset($parameters["method"]) && $parameters['method'] == "GET")
+ }else if (isset($parameters["method"]) && $parameters['method'] == "GET") {
$response = $curl->get($url, $parameters['body']);
- else if (isset($parameters["method"]) && $parameters['method'] == "PUT")
+ }else if (isset($parameters["method"]) && $parameters['method'] == "PUT") {
$response = $curl->put($url, $parameters['body']);
- else if (isset($parameters["method"]) && $parameters['method'] == "PATCH")
+ }else if (isset($parameters["method"]) && $parameters['method'] == "PATCH") {
$response = $curl->patch($url, $parameters['body']);
- else if (isset($parameters["method"]) && $parameters['method'] == "DELETE")
+ }else if (isset($parameters["method"]) && $parameters['method'] == "DELETE") {
$response = $curl->delete($url);
+ }
$min_id = null;
$max_id = null;
@@ -288,7 +250,7 @@ class Mastodon_api
$data['error'] = $response->error;
$data['error_code'] = $response->error_code;
$data['error_message'] = $response->error_message;
- if ($response->response)
+ if ($response->response && isset(json_decode($response->response, true)['error']))
$data['error_message'] = json_decode($response->response, true)['error'];
} else {
$data['response_headers'] = $response->response_headers;
@@ -1313,6 +1275,16 @@ class Mastodon_api
$Polls->setMinExpiration($instantParams['configuration']['polls']['min_expiration']);
$Polls->setMaxExpiration($instantParams['configuration']['polls']['max_expiration']);
}
+ } else if (isset($instantParams['pleroma'])) {
+ if (isset($instantParams['poll_limits'])) {
+ $Polls->setMaxOptions($instantParams['poll_limits']['max_options']);
+ $Polls->setMaxCharactersPerOption($instantParams['poll_limits']['max_option_chars']);
+ $Polls->setMinExpiration($instantParams['poll_limits']['min_expiration']);
+ $Polls->setMaxExpiration($instantParams['poll_limits']['max_expiration']);
+ }
+ if(isset($instantParams['max_toot_chars'])) {
+ $Statuses->setMaxCharacters($instantParams['max_toot_chars']);
+ }
}
$Configuration->setStatuses($Statuses);
$Configuration->setMediaAttachments($MediaAttachments);
diff --git a/translations/fediplan.tr.yaml b/translations/fediplan.tr.yaml
index ae36c75..4f2eb26 100644
--- a/translations/fediplan.tr.yaml
+++ b/translations/fediplan.tr.yaml
@@ -41,7 +41,7 @@ error:
mastodon_account_already_used: This account is already managed by someone else!
page:
index:
- about: FediPlan is an open source application (source code) built for scheduling your messages with Mastodon or Pleroma (2.7+).
+ about: FediPlan is an open source application (source code) built for scheduling your messages with Mastodon or Pleroma (2.0.7+).
data: It does not store any data (token or messages), that is why you need to create a new Token when your session expired.
form:
code: Your authorization code