aadil/fedi-tumblr
0
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

More work on polls and themes

Browse Source
This commit is contained in:
Daisuke
2020-04-21 17:42:31 -05:00
parent d34a7c7ced
commit f59049c3c2
18 changed files with 281 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/timeline.php
View File

@ -5,7 +5,7 @@
a "timeline" may be something like TWKN or just a single post
*/
list($thread, $next) = timeline(array_merge($tl, $user_settings));
$thread = timeline(array_merge($tl, $user_settings));
/*
if the timeline requested is the first part of an user profile it will render first
@ -134,6 +134,11 @@ if ((!isset($thread[0]['id']) && !empty($thread)) || !is_array($thread)) {
from the "reblog" key
*/
if ($elem['reblog'] != null) {
if ($user_settings['reblog'] == 'off'){
continue;
}
$post['name'] = "<b><span id='" . $elem['reblog']['account']['id'] . "' class='user'><a class='link ldr' href='?user=" . $elem['reblog']['account']['id'] . "'>" . emojify($elem['reblog']['account']['display_name'], $elem['reblog']['account']['emojis'], 15) . "</a></span></b>";
$post['replyto'] = "<span>" . ($elem['reblog']['in_reply_to_id'] ? " <a class='fontello link preview ldr' target='_blank' id='" . $elem['reblog']['in_reply_to_id'] . "' href='?thread=" . $elem['reblog']['in_reply_to_id'] . "'>&#xf112;</a>" : "") . "</span>";
$post['rt'] = "<span>[ <span style='font-family:fontello'> &#xe826; </span> by <img src='" . $elem['account']['avatar'] . "' width=30 style='vertical-align:middle; border-radius:30px;'> <a class='link ldr user' id='" . $elem['account']['id'] . "' href='?user=" . $elem['account']['id'] . "'><span class='desktop'>" . emojify($elem['account']['display_name'], $elem['account']['emojis'], 15) . "</span><span class='mobile'>@" . explode("@", $elem['account']['acct']) [0] . "</span></a> ]</span>";
@ -286,8 +291,8 @@ if ((!isset($thread[0]['id']) && !empty($thread)) || !is_array($thread)) {
$direct = "&#xf0e0;";
/* the code of the post footer (date, visibility and like/reblog buttons */
$post['footer'] = "<div style='float:left; color:darkgray;'>
<a style='text-decoration:none;color:darkgray;' class='ldr' target='_blank' href='?thread=" . $elem['id'] . "&instance=$srv" . "'>" . date("d/m/y H:i", strtotime($elem['created_at'])) . "</a> - <span class='fontello'>" . $$elem['visibility'] . " </span>
$post['footer'] = "<div style='float:left;'>
<a style='text-decoration:none;' class='ldr' target='_blank' href='?thread=" . $elem['id'] . "&instance=$srv" . "' title='".gmdate("d/m/y H:i", strtotime($elem['created_at']))."'>" .time_elapsed_string($elem['created_at']) . "</a> - <span class='fontello'>" . $$elem['visibility'] . " </span>
</div>
<div class='post_buttons' id='" . $elem['id'] . "'>
" . ($logedin ? "<div class='felem'><a onClick='return false' class='replyform' href='?thread=" . $elem['id'] . "' style='font-family:fontello; vertical-align:middle;' alt='reply'>&#xf112;</a></div>" : "") . "
@ -346,6 +351,7 @@ if ((!isset($thread[0]['id']) && !empty($thread)) || !is_array($thread)) {
echo $post['template'];
unset($post);
$e++;
$next = $elem['id'];
}
if ((!isset($_GET['next']) || (isset($_GET['next']) && !isset($_GET['ajax']))) && !isset($_GET['since']) && !isset($_GET['thread'])) {
$query = http_build_query(array_filter(array(