Merge pull request #500 from tobiasd/20180124-nsfwde3

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

diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index cf820ca7e860bbcb8e502b2caf05f6652f080eae..b8a170a1b4678cc5f1fa18ba7daeb8bb015f42af 100644 (file)
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -4,24 +4,27 @@
  * Description: Additional gender/sexual preference/marital status options
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ *    - who takes no responsibility for any additional content which may appear herein
  *
  */
-
+use Friendica\Core\Addon;
 
 function morechoice_install() {
 
-       register_hook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
-       register_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
-       register_hook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
-
+       Addon::registerHook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
+       Addon::registerHook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
+       Addon::registerHook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
 }
 
 
 function morechoice_uninstall() {
 
-       unregister_hook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
-       unregister_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
-       unregister_hook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
+       Addon::unregisterHook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
+       Addon::unregisterHook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
+       Addon::unregisterHook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
+
+// We need to leave this here for a while, because we now have a situation where people can end up with an orphaned hook.
+       Addon::unregisterHook('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs');
 
 }
 
@@ -106,6 +109,7 @@ function morechoice_sexpref_selector($a,&$b) {
                $b[] = 'Eating people';
                $b[] = 'Being eaten';
                $b[] = 'Animals';
+               $b[] = 'I\'d rather just have some chocolate';
        }
 }
 
@@ -114,6 +118,9 @@ function morechoice_marital_selector($a,&$b) {
                $b[] = 'Married to my job';
                $b[] = 'Polygamist';
                $b[] = 'Half married';
-
+               $b[] = 'Living in the past';
+               $b[] = 'Pretending to be over my ex';
+               $b[] = 'Hurt in the past';
+               $b[] = 'Wallowing in self-pity';
        }
-}
+}
\ No newline at end of file