diff --git a/boot.php b/boot.php index c6f7b1e20d..148ca5e6e2 100644 --- a/boot.php +++ b/boot.php @@ -411,7 +411,6 @@ define('ACTIVITY_SHARE', NAMESPACE_ACTIVITY_SCHEMA . 'share'); define('ACTIVITY_DELETE', NAMESPACE_ACTIVITY_SCHEMA . 'delete'); define('ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke'); -define('ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood'); define('ACTIVITY_OBJ_BOOKMARK', NAMESPACE_ACTIVITY_SCHEMA . 'bookmark'); define('ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment'); diff --git a/include/conversation.php b/include/conversation.php index 4b9459a3f7..2543a5170e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -258,20 +258,6 @@ function localize_item(&$item) { $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto; } - if (stristr($item['verb'], ACTIVITY_MOOD)) { - $verb = urldecode(substr($item['verb'], strpos($item['verb'], '#') + 1)); - if (! $verb) { - return; - } - - $Aname = $item['author-name']; - $Alink = $item['author-link']; - $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; - - $txt = t('%1$s is currently %2$s'); - - $item['body'] = sprintf($txt, $A, t($verb)); - } if (activity_match($item['verb'], ACTIVITY_TAG)) { /// @TODO may hurt performance "joining" two tables + asterisk diff --git a/include/text.php b/include/text.php index 3fce67fa1c..d25b41ae88 100644 --- a/include/text.php +++ b/include/text.php @@ -1118,40 +1118,6 @@ function get_poke_verbs() { return $arr; } -/** - * Load moods - * @return array index is mood, value is translated mood - * @hook mood_verbs moods array - */ -function get_mood_verbs() { - - $arr = array( - 'happy' => t('happy'), - 'sad' => t('sad'), - 'mellow' => t('mellow'), - 'tired' => t('tired'), - 'perky' => t('perky'), - 'angry' => t('angry'), - 'stupefied' => t('stupified'), - 'puzzled' => t('puzzled'), - 'interested' => t('interested'), - 'bitter' => t('bitter'), - 'cheerful' => t('cheerful'), - 'alive' => t('alive'), - 'annoyed' => t('annoyed'), - 'anxious' => t('anxious'), - 'cranky' => t('cranky'), - 'disturbed' => t('disturbed'), - 'frustrated' => t('frustrated'), - 'motivated' => t('motivated'), - 'relaxed' => t('relaxed'), - 'surprised' => t('surprised'), - ); - - call_hooks('mood_verbs', $arr); - return $arr; -} - /** * @brief Translate days and months names. *