[various] Remove App dependency from hook functions

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

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 819d9eca11952d4b20739d071afc5aecbc97aaaf..dcbd65f80c816a26f2973c31fa3917d0621ff007 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -11,8 +11,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileLoader;
-use Friendica\Core\Session;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\XML;
 
 function geonames_install()
@@ -34,12 +33,12 @@ function geonames_install()
        Hook::register('addon_settings_post', __FILE__, 'geonames_addon_settings_post');
 }
 
-function geonames_load_config(App $a, ConfigFileLoader $loader)
+function geonames_load_config(ConfigFileManager $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('geonames'));
+       DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
-function geonames_post_hook(App $a, array &$item)
+function geonames_post_hook(array &$item)
 {
        /* An item was posted on the local system.
         * We are going to look for specific items:
@@ -49,11 +48,11 @@ function geonames_post_hook(App $a, array &$item)
 
        Logger::notice('geonames invoked');
 
-       if (!Session::getLocalUser()) {   /* non-zero if this is a logged in user of this system */
+       if (!DI::userSession()->getLocalUserId()) {   /* non-zero if this is a logged in user of this system */
                return;
        }
 
-       if (Session::getLocalUser() != $item['uid']) {   /* Does this person own the post? */
+       if (DI::userSession()->getLocalUserId() != $item['uid']) {   /* Does this person own the post? */
                return;
        }
 
@@ -64,7 +63,7 @@ function geonames_post_hook(App $a, array &$item)
        /* Retrieve our personal config setting */
 
        $geo_account = DI::config()->get('geonames', 'username');
-       $active = DI::pConfig()->get(Session::getLocalUser(), 'geonames', 'enable');
+       $active = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'geonames', 'enable');
 
        if (!$geo_account || !$active) {
                return;
@@ -98,29 +97,27 @@ function geonames_post_hook(App $a, array &$item)
  * We will make sure we've got a valid user account
  * and if so set our configuration setting for this person.
  *
- * @param App   $a
  * @param array $post The $_POST array
  */
-function geonames_addon_settings_post(App $a, array $post)
+function geonames_addon_settings_post(array $post)
 {
-       if (!Session::getLocalUser() || empty($_POST['geonames-submit'])) {
+       if (!DI::userSession()->getLocalUserId() || empty($_POST['geonames-submit'])) {
                return;
        }
 
-       DI::pConfig()->set(Session::getLocalUser(), 'geonames', 'enable', intval($_POST['geonames-enable']));
+       DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'geonames', 'enable', intval($_POST['geonames-enable']));
 }
 
 /**
  * Called from the Addon Setting form.
  * Add our own settings info to the page.
  *
- * @param App   $a
  * @param array $data
  * @throws Exception
  */
-function geonames_addon_settings(App $a, array &$data)
+function geonames_addon_settings(array &$data)
 {
-       if (!Session::getLocalUser()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
@@ -129,7 +126,7 @@ function geonames_addon_settings(App $a, array &$data)
                return;
        }
 
-       $enabled = intval(DI::pConfig()->get(Session::getLocalUser(), 'geonames', 'enable'));
+       $enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'geonames', 'enable'));
 
        $t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/geonames/');
        $html = Renderer::replaceMacros($t, [