diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index d030c33b3..ad1d1e64a 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1835,7 +1835,7 @@ class Activity { } - if(in_array($act->type, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept' ])) { + if(in_array($act->type, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'emojiReaction' ])) { $response_activity = true; @@ -1900,8 +1900,6 @@ class Activity { $s['obj']['actor'] = $s['obj']['actor']['id']; } - - // @todo add target if present $instrument = $act->get_property_obj('instrument'); diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index d55875f94..b1a046748 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -28,6 +28,9 @@ class System { } static public function get_project_icon() { + + return z_root() . '/images/bolt-64.png'; + if(defined('NOMADIC')) { return '⚡'; } diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 407a37591..70655097c 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -444,7 +444,7 @@ class ThreadItem { 'has_tags' => $has_tags, 'reactions' => $this->reactions, // Item toolbar buttons - 'emojis' => '', // (($this->is_toplevel() && $this->is_commentable() && $observer && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''), + 'emojis' => '', // (($this->is_toplevel() && $this->is_commentable() && $observer /* && feature_enabled($conv->get_profile_owner(),'emojis') */ ) ? '1' : ''), 'like' => $like, 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''), 'share' => $share, diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php index a5e1c2abe..3eb4199de 100644 --- a/Zotlabs/Module/Apschema.php +++ b/Zotlabs/Module/Apschema.php @@ -21,6 +21,7 @@ class Apschema extends \Zotlabs\Web\Controller { 'commentPolicy' => 'zot:commentPolicy', 'topicalCollection' => 'zot:topicalCollection', 'eventRepeat' => 'zot:eventRepeat', + 'emojiReaction' => 'zot:emojiReaction', ] ]; diff --git a/Zotlabs/Module/React.php b/Zotlabs/Module/React.php index 439929baf..6143626c6 100644 --- a/Zotlabs/Module/React.php +++ b/Zotlabs/Module/React.php @@ -49,22 +49,26 @@ class React extends Controller { return; } + $item = array_shift($i); $n = [] ; $n['aid'] = $channel['channel_account_id']; $n['uid'] = $channel['channel_id']; $n['item_origin'] = true; - $n['item_type'] = $i[0]['item_type']; + $n['item_type'] = $item['item_type']; $n['parent'] = $postid; - $n['parent_mid'] = $i[0]['mid']; + $n['parent_mid'] = $item['mid']; $n['uuid'] = new_uuid(); $n['mid'] = z_root() . '/item/' . $n['uuid']; - $n['verb'] = ACTIVITY_REACT . '#' . $emoji; - $n['body'] = "\n\n[zmg=32x32]" . z_root() . '/images/emoji/' . $emoji . '.png[/zmg]' . "\n\n"; + $n['verb'] = 'emojiReaction'; + $n['body'] = "\n\n[size=48]" . '&#x' . $emoji . ';[/size]' . "\n\n"; $n['author_xchan'] = $channel['channel_hash']; - $object = json_encode(Activity::fetch_item( [ 'id' => $item['mid'] ] )); - + $n['obj'] = Activity::fetch_item( [ 'id' => $item['mid'] ] ); + $n['obj_type'] = ((array_path_exists('obj/type',$n)) ? $n['obj']['type'] : EMPTY_STR); + // This needs more work to provide an ActivityPub compatible object, if that is ever desired + $n['target'] = [ 'name' => $emoji ]; + $x = item_store($n); retain_item($postid); diff --git a/boot.php b/boot.php index 761ba4dcd..4192935c9 100755 --- a/boot.php +++ b/boot.php @@ -462,7 +462,7 @@ define ( 'NAMESPACE_YMEDIA', 'http://search.yahoo.com/mrss/' ); define ( 'ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams' ); -define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.6' ); +define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.7' ); /** * activity stream defines */ diff --git a/images/bolt-64.png b/images/bolt-64.png new file mode 100644 index 000000000..1e9024ec1 Binary files /dev/null and b/images/bolt-64.png differ diff --git a/images/bolt.svg b/images/bolt.svg new file mode 100644 index 000000000..6b6c5c5dc --- /dev/null +++ b/images/bolt.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/images/bolt.xcf b/images/bolt.xcf new file mode 100644 index 000000000..5559bf371 Binary files /dev/null and b/images/bolt.xcf differ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6f965f7d1..d8615146c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -18,6 +18,11 @@ html { margin-right: 0.5rem; } +.project-banner img { + height: 1.5rem; + width: 1.5rem; +} + .project-banner a { color: $banner_colour; } @@ -475,6 +480,7 @@ footer { margin-bottom: 15px; } + .app-name { overflow: none; } @@ -696,10 +702,14 @@ nav .acpopup { font-weight: bold; } +.suggest-connect-btn { + margin-top: 1em; +} + .profile-match-wrapper { float: left; width: 120px; - height: 150px; + height: 110px; padding: 10px; margin: 8px 10px 0 0; border-top: 1px solid #eee; @@ -1602,7 +1612,6 @@ dl.bb-dl > dd > li { display: inline-block; border-radius: $radius; cursor: text; - padding: 0px 10px; width: 100%; } diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 6dca42b92..1cff59fbb 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,13 +7,13 @@ - + - + diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 04df1e86e..74537f98b 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -1,4 +1,4 @@ -
{{$project_icon}}
+
{{$project_title}}
{{if $nav.login && !$userinfo}}
{{if $nav.loginmenu.1.4}} diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl index 95f24cd63..0e65dcd22 100755 --- a/view/tpl/suggest_friends.tpl +++ b/view/tpl/suggest_friends.tpl @@ -11,6 +11,6 @@
{{if $entry.connlnk}} -
{{$entry.conntxt}}
+
{{$entry.conntxt}}
{{/if}}
{{$notify_icon}}
{{$product}}
logo
{{$product}}
{{$preamble}}
photo {{$source_name}}
{{$title}}
{{$htmlversion}}