mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-21 10:35:14 +00:00
Merge branch 'dev' into release
This commit is contained in:
commit
df76137a4e
5 changed files with 5 additions and 8 deletions
|
@ -984,7 +984,7 @@ class Activity
|
||||||
}
|
}
|
||||||
|
|
||||||
$d = q(
|
$d = q(
|
||||||
"select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d limit 1",
|
"select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d and hubloc_deleted = 0 order by hubloc_id desc limit 1",
|
||||||
dbesc($i['parent_mid']),
|
dbesc($i['parent_mid']),
|
||||||
intval($i['uid'])
|
intval($i['uid'])
|
||||||
);
|
);
|
||||||
|
@ -1432,7 +1432,7 @@ class Activity
|
||||||
|
|
||||||
|
|
||||||
$d = q(
|
$d = q(
|
||||||
"select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d limit 1",
|
"select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.parent_mid = '%s' and item.uid = %d and hubloc_deleted = 0 order by hubloc_id desc limit 1",
|
||||||
dbesc($i['parent_mid']),
|
dbesc($i['parent_mid']),
|
||||||
intval($i['uid'])
|
intval($i['uid'])
|
||||||
);
|
);
|
||||||
|
|
|
@ -479,7 +479,7 @@ class Queue
|
||||||
|
|
||||||
if ($channel && $base) {
|
if ($channel && $base) {
|
||||||
$h = q(
|
$h = q(
|
||||||
"select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network in ('zot6','nomad') order by hubloc_id desc limit 1",
|
"select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network in ('zot6','nomad') and hubloc_deleted = 0 order by hubloc_id desc limit 1",
|
||||||
dbesc($base)
|
dbesc($base)
|
||||||
);
|
);
|
||||||
if ($h) {
|
if ($h) {
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
Streams
|
|
||||||
=======
|
|
||||||
|
|
||||||
So what is this space? It is sort of a personal software repository where I explore the bounds of contemporary decentralised social communications technology. It will install as a fediverse server using the LAMP stack. It is regularly maintained and updated and you are welcome to help - if you want. The commit log chronicles a dozen years of fediverse evolution from an alternative point of view - centered around the concepts of personal privacy, permissions, relative freedom from spam and abuse, autonomy, resilience, and self-determination; which I've found are mostly lacking or completely inadequate in many of the popular/mainstream fediverse projects.
|
So what is this space? It is sort of a personal software repository where I explore the bounds of contemporary decentralised social communications technology. It will install as a fediverse server using the LAMP stack. It is regularly maintained and updated and you are welcome to help - if you want. The commit log chronicles a dozen years of fediverse evolution from an alternative point of view - centered around the concepts of personal privacy, permissions, relative freedom from spam and abuse, autonomy, resilience, and self-determination; which I've found are mostly lacking or completely inadequate in many of the popular/mainstream fediverse projects.
|
||||||
|
|
||||||
This work is dedicated and released to the public domain with no strings attached. Be advised that many others have contributed code to this repository under a number of different OSI-approved software licenses during its existence. This has no effect on any of your fundamental software freedoms; although corporate legal consultants who wish to re-appropriate our work for their employer's profit will likely find this lack of license clarity "troublesome". This is intentional.
|
This work is dedicated and released to the public domain with no strings attached. Be advised that many others have contributed code to this repository under a number of different OSI-approved software licenses during its existence. This has no effect on any of your fundamental software freedoms; although corporate legal consultants who wish to re-appropriate our work for their employer's profit will likely find this lack of license clarity "troublesome". This is intentional.
|
||||||
|
|
|
@ -2049,7 +2049,7 @@ function format_poll($item, $s, $opts)
|
||||||
if ($activated && $commentable) {
|
if ($activated && $commentable) {
|
||||||
|
|
||||||
$output .= '<input type="radio" name="answer" value="' . htmlspecialchars($text) . '"> <strong>' . $text . '</strong>' . EOL;
|
$output .= '<input type="radio" name="answer" value="' . htmlspecialchars($text) . '"> <strong>' . $text . '</strong>' . EOL;
|
||||||
$output .= '<div class="progress bg-opacity-25" style="height: 3px;">';
|
$output .= '<div class="progress bg-opacity-25" style="height: 3px; max-width: 75%;">';
|
||||||
$output .= '<div class="progress-bar bg-default" role="progressbar" style="width: ' . (($totalResponses) ? intval($total / $totalResponses * 100) : 0). '%;" aria-valuenow="" aria-valuemin="0" aria-valuemax="100"></div>';
|
$output .= '<div class="progress-bar bg-default" role="progressbar" style="width: ' . (($totalResponses) ? intval($total / $totalResponses * 100) : 0). '%;" aria-valuenow="" aria-valuemin="0" aria-valuemax="100"></div>';
|
||||||
$output .= '</div>';
|
$output .= '</div>';
|
||||||
$output .= '<div class="text-muted"><small>' . sprintf(tt('%d Vote', '%d Votes', $total, 'noun'), $total) . ' | ' . (($totalResponses) ? intval($total / $totalResponses * 100) . '%' : '0%') . '</small></div>';
|
$output .= '<div class="text-muted"><small>' . sprintf(tt('%d Vote', '%d Votes', $total, 'noun'), $total) . ' | ' . (($totalResponses) ? intval($total / $totalResponses * 100) . '%' : '0%') . '</small></div>';
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
<?php
|
<?php
|
||||||
define ( 'STD_VERSION', '22.04.05' );
|
define ( 'STD_VERSION', '22.04.07' );
|
||||||
|
|
Loading…
Reference in a new issue