Merge pull request #1267 from nupplaphil/feat/woodpecker

[friendica-addons.git] / geocoordinates / geocoordinates.php

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 77bfa8e6e9f89759d02da18dbfd18ad4f824d3a1..73210b6688a79e9ca719d1bd9906d83f15b37426 100644 (file)
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -5,14 +5,12 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+
+use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Util\Network;
-use Friendica\Util\Strings;
+use Friendica\DI;
 
 function geocoordinates_install()
 {
@@ -20,23 +18,16 @@ function geocoordinates_install()
        Hook::register('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
 }
 
-
-function geocoordinates_uninstall()
-{
-       Hook::unregister('post_local',    'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
-       Hook::unregister('post_remote',    'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
-}
-
 function geocoordinates_resolve_item(&$item)
 {
        if((!$item["coord"]) || ($item["location"]))
                return;
 
-       $key = Config::get("geocoordinates", "api_key");
+       $key = DI::config()->get("geocoordinates", "api_key");
        if ($key == "")
                return;
 
-       $language = Config::get("geocoordinates", "language");
+       $language = DI::config()->get("geocoordinates", "language");
        if ($language == "")
                $language = "de";
 
@@ -48,62 +39,61 @@ function geocoordinates_resolve_item(&$item)
        $coords[0] = round($coords[0], 5);
        $coords[1] = round($coords[1], 5);
 
-       $result = Cache::get("geocoordinates:".$language.":".$coords[0]."-".$coords[1]);
+       $result = DI::cache()->get("geocoordinates:".$language.":".$coords[0]."-".$coords[1]);
        if (!is_null($result)) {
                $item["location"] = $result;
                return;
        }
 
-       $s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
+       $s = DI::httpClient()->fetch("https://api.opencagedata.com/geocode/v1/json?q=" . $coords[0] . "," . $coords[1] . "&key=" . $key . "&language=" . $language);
 
        if (!$s) {
-               Logger::log("API could not be queried", Logger::DEBUG);
+               Logger::info("API could not be queried");
                return;
        }
 
        $data = json_decode($s);
 
        if ($data->status->code != "200") {
-               Logger::log("API returned error ".$data->status->code." ".$data->status->message, Logger::DEBUG);
+               Logger::info("API returned error ".$data->status->code." ".$data->status->message);
                return;
        }
 
        if (($data->total_results == 0) || (count($data->results) == 0)) {
-               Logger::log("No results found for coordinates ".$item["coord"], Logger::DEBUG);
+               Logger::info("No results found for coordinates ".$item["coord"]);
                return;
        }
 
        $item["location"] = $data->results[0]->formatted;
 
-       Logger::log("Got location for coordinates ".$coords[0]."-".$coords[1].": ".$item["location"], Logger::DEBUG);
+       Logger::info("Got location for coordinates ".$coords[0]."-".$coords[1].": ".$item["location"]);
 
        if ($item["location"] != "")
-               Cache::set("geocoordinates:".$language.":".$coords[0]."-".$coords[1], $item["location"]);
+               DI::cache()->set("geocoordinates:".$language.":".$coords[0]."-".$coords[1], $item["location"]);
 }
 
-function geocoordinates_post_hook($a, &$item)
+function geocoordinates_post_hook(App $a, &$item)
 {
        geocoordinates_resolve_item($item);
 }
 
-function geocoordinates_addon_admin(&$a, &$o)
+function geocoordinates_addon_admin(App $a, &$o)
 {
 
        $t = Renderer::getMarkupTemplate("admin.tpl", "addon/geocoordinates/");
 
        $o = Renderer::replaceMacros($t, [
-               '$submit' => L10n::t('Save Settings'),
-               '$api_key' => ['api_key', L10n::t('API Key'), Config::get('geocoordinates', 'api_key'), ''],
-               '$language' => ['language', L10n::t('Language code (IETF format)'), Config::get('geocoordinates', 'language'), ''],
+               '$submit' => DI::l10n()->t('Save Settings'),
+               '$api_key' => ['api_key', DI::l10n()->t('API Key'), DI::config()->get('geocoordinates', 'api_key'), ''],
+               '$language' => ['language', DI::l10n()->t('Language code (IETF format)'), DI::config()->get('geocoordinates', 'language'), ''],
        ]);
 }
 
-function geocoordinates_addon_admin_post(&$a)
+function geocoordinates_addon_admin_post(App $a)
 {
-       $api_key  = (!empty($_POST['api_key']) ? Strings::escapeTags(trim($_POST['api_key']))   : '');
-       Config::set('geocoordinates', 'api_key', $api_key);
+       $api_key  = trim($_POST['api_key'] ?? '');
+       DI::config()->set('geocoordinates', 'api_key', $api_key);
 
-       $language  = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language']))   : '');
-       Config::set('geocoordinates', 'language', $language);
-       info(L10n::t('Settings updated.'). EOL);
+       $language  = trim($_POST['language'] ?? '');
+       DI::config()->set('geocoordinates', 'language', $language);
 }