friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6962 from annando/display-reshare 

Display if an item is reshared
This commit is contained in:
Tobias Diekershoff 2019-04-02 09:23:53 +02:00 committed by GitHub
parent b73caa83fc a0fddca407
commit 48afc0fbed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/conversation.php
View File

@ -565,8 +565,12 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$items = $cb['items']; $items = $cb['items'];
$conv_responses = [ $conv_responses = [
'like' => ['title' => L10n::t('Likes','title')], 'dislike' => ['title' => L10n::t('Dislikes','title')], 'like' => ['title' => L10n::t('Likes','title')],
'attendyes' => ['title' => L10n::t('Attending','title')], 'attendno' => ['title' => L10n::t('Not attending','title')], 'attendmaybe' => ['title' => L10n::t('Might attend','title')] 'dislike' => ['title' => L10n::t('Dislikes','title')],
'attendyes' => ['title' => L10n::t('Attending','title')],
'attendno' => ['title' => L10n::t('Not attending','title')],
'attendmaybe' => ['title' => L10n::t('Might attend','title')],
'announce' => ['title' => L10n::t('Reshares','title')]
]; ];
// array with html for each thread (parent+comments) // array with html for each thread (parent+comments)
@ -963,6 +967,9 @@ function builtin_activity_puller($item, &$conv_responses) {
case 'attendmaybe': case 'attendmaybe':
$verb = ACTIVITY_ATTENDMAYBE; $verb = ACTIVITY_ATTENDMAYBE;
break; break;
case 'announce':
$verb = ACTIVITY2_ANNOUNCE;
break;
default: default:
return; return;
} }
@ -1045,6 +1052,9 @@ function format_like($cnt, array $arr, $type, $id) {
case 'attendmaybe' : case 'attendmaybe' :
$phrase = L10n::t('%s attends maybe.', $likers); $phrase = L10n::t('%s attends maybe.', $likers);
break; break;
case 'announce' :
$phrase = L10n::t('%s reshared this.', $likers);
break;
} }
} }
@ -1084,6 +1094,10 @@ function format_like($cnt, array $arr, $type, $id) {
$phrase = L10n::t('<span %1$s>%2$d people</span> attend maybe', $spanatts, $cnt); $phrase = L10n::t('<span %1$s>%2$d people</span> attend maybe', $spanatts, $cnt);
$explikers = L10n::t('%s attend maybe.', $likers); $explikers = L10n::t('%s attend maybe.', $likers);
break; break;
case 'announce':
$phrase = L10n::t('<span %1$s>%2$d people</span> reshared this', $spanatts, $cnt);
$explikers = L10n::t('%s reshared this.', $likers);
break;
} }
$expanded .= "\t" . '<p class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</p>'; $expanded .= "\t" . '<p class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</p>';

2
src/Object/Post.php
View File

@ -238,7 +238,7 @@ class Post extends BaseObject
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
// process action responses - e.g. like/dislike/attend/agree/whatever // process action responses - e.g. like/dislike/attend/agree/whatever
$response_verbs = ['like', 'dislike']; $response_verbs = ['like', 'dislike', 'announce'];
$isevent = false; $isevent = false;
$attend = []; $attend = [];