Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nomadic' of codeberg.org:streams/streams into nomadic

Browse source
This commit is contained in:
Mike Macgirvin 2024-04-19 08:23:07 +10:00
commit d158fba6bb
6 changed files with 45 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
composer.lock generated
View file

@ -979,16 +979,16 @@
},
{
"name": "doctrine/common",
"version": "3.4.3",
"version": "3.4.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
"reference": "8b5e5650391f851ed58910b3e3d48a71062eeced"
"reference": "0aad4b7ab7ce8c6602dfbb1e1a24581275fb9d1a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/8b5e5650391f851ed58910b3e3d48a71062eeced",
"reference": "8b5e5650391f851ed58910b3e3d48a71062eeced",
"url": "https://api.github.com/repos/doctrine/common/zipball/0aad4b7ab7ce8c6602dfbb1e1a24581275fb9d1a",
"reference": "0aad4b7ab7ce8c6602dfbb1e1a24581275fb9d1a",
"shasum": ""
},
"require": {
@ -1050,7 +1050,7 @@
],
"support": {
"issues": "https://github.com/doctrine/common/issues",
"source": "https://github.com/doctrine/common/tree/3.4.3"
"source": "https://github.com/doctrine/common/tree/3.4.4"
},
"funding": [
{
@ -1066,7 +1066,7 @@
"type": "tidelift"
}
],
"time": "2022-10-09T11:47:59+00:00"
"time": "2024-04-16T13:35:33+00:00"
},
{
"name": "doctrine/dbal",
@ -11876,34 +11876,34 @@
},
{
"name": "twig/extra-bundle",
"version": "v3.8.0",
"version": "v3.9.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/twig-extra-bundle.git",
"reference": "32807183753de0388c8e59f7ac2d13bb47311140"
"reference": "3a68ffc7747ecc25823cabe2127710ced516a16a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/32807183753de0388c8e59f7ac2d13bb47311140",
"reference": "32807183753de0388c8e59f7ac2d13bb47311140",
"url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/3a68ffc7747ecc25823cabe2127710ced516a16a",
"reference": "3a68ffc7747ecc25823cabe2127710ced516a16a",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/framework-bundle": "^5.4|^6.0|^7.0",
"symfony/twig-bundle": "^5.4|^6.0|^7.0",
"symfony/framework-bundle": "^5.4|^6.4|^7.0",
"symfony/twig-bundle": "^5.4|^6.4|^7.0",
"twig/twig": "^3.0"
},
"require-dev": {
"league/commonmark": "^1.0|^2.0",
"symfony/phpunit-bridge": "^6.4|^7.0",
"twig/cache-extra": "^3.0",
"twig/cssinliner-extra": "^2.12|^3.0",
"twig/html-extra": "^2.12|^3.0",
"twig/inky-extra": "^2.12|^3.0",
"twig/intl-extra": "^2.12|^3.0",
"twig/markdown-extra": "^2.12|^3.0",
"twig/string-extra": "^2.12|^3.0"
"twig/cssinliner-extra": "^3.0",
"twig/html-extra": "^3.0",
"twig/inky-extra": "^3.0",
"twig/intl-extra": "^3.0",
"twig/markdown-extra": "^3.0",
"twig/string-extra": "^3.0"
},
"type": "symfony-bundle",
"autoload": {
@ -11934,7 +11934,7 @@
"twig"
],
"support": {
"source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.8.0"
"source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.9.0"
},
"funding": [
{
@ -11946,34 +11946,41 @@
"type": "tidelift"
}
],
"time": "2023-11-21T14:02:01+00:00"
"time": "2024-02-07T08:24:24+00:00"
},
{
"name": "twig/twig",
"version": "v3.8.0",
"version": "v3.9.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d"
"reference": "47857eebb197745f66369b76c044a2359e3cc5b9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
"reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/47857eebb197745f66369b76c044a2359e3cc5b9",
"reference": "47857eebb197745f66369b76c044a2359e3cc5b9",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/deprecation-contracts": "^2.5|^3",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-php80": "^1.22"
},
"require-dev": {
"psr/container": "^1.0|^2.0",
"symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0"
"symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
},
"type": "library",
"autoload": {
"files": [
"src/Resources/core.php",
"src/Resources/debug.php",
"src/Resources/escaper.php",
"src/Resources/string_loader.php"
],
"psr-4": {
"Twig\\": "src/"
}
@ -12006,7 +12013,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v3.8.0"
"source": "https://github.com/twigphp/Twig/tree/v3.9.0"
},
"funding": [
{
@ -12018,7 +12025,7 @@
"type": "tidelift"
}
],
"time": "2023-11-21T18:54:41+00:00"
"time": "2024-04-16T16:04:21+00:00"
},
{
"name": "voku/portable-ascii",

2
include/feedutils.php
View file

@ -148,7 +148,7 @@ function get_feed_for($channel, $observer_hash, $params)
'top' => $params['top'],
'cat' => $params['cat'],
'compat' => $params['compat'],
'noadd' => true
'noadd' => $params['noadd']
],
$channel,
$observer_hash,

10
include/items.php
View file

@ -4249,12 +4249,9 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
if (! (isset($arr['include_follow']) && intval($arr['include_follow']))) {
$item_normal .= " and not verb in ( 'Follow' , 'Ignore' ) ";
$item_normal .= " and verb not in ( 'Follow' , 'Ignore' ) ";
}
if (isset($arr['noadd']) && $arr['noadd']) {
$item_normal .= " and not verb in ('Add', 'Remove') ";
}
if (isset($arr['star']) && $arr['star']) {
$sql_options .= " and item_starred = 1 ";
@ -4422,6 +4419,11 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$item_restrict = '';
}
if (isset($arr['noadd']) && $arr['noadd']) {
$item_restrict .= " and verb not in ('Add', 'Remove') ";
}
if (((isset($arr['compat']) && $arr['compat']) || ((isset($arr['nouveau']) && $arr['nouveau']) && ($client_mode & CLIENT_MODE_LOAD))) && $channel) {
// "New Item View" - show all items unthreaded in reverse created date order

1
src/Module/Apresolver.php
View file

@ -86,6 +86,7 @@ class Apresolver extends Controller
if ($this->module) {
return $this->module->get();
}
return '';
}
protected function mapObject($path, $channel)

2
src/Update/_1278.php
View file

@ -12,6 +12,7 @@ class _1278
if (ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r1 = q("ALTER TABLE item ALTER COLUMN lat TYPE double precision");
$r2 = q("ALTER TABLE item ALTER COLUMN lon TYPE double precision");
$r = ($r1 && $r2);
}
else {
@ -32,7 +33,6 @@ class _1278
public function verify()
{
$columns = db_columns('item');
if (in_array('lat', $columns) && in_array('lon', $columns)) {

2
version.php
View file

@ -1,2 +1,2 @@
<?php
define ('STD_VERSION', '24.04.11');
define ('STD_VERSION', '24.04.17');