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

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

Browse source
This commit is contained in:
Mike Macgirvin 2023-09-17 07:44:14 +10:00
commit 6a512717b0
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Code/Lib/Activity.php
View file

@ -2891,7 +2891,7 @@ class Activity
// Intransitives. Treat the target as the object in order to pick out any
// important fields and represent those as an item.
if (in_array($act->type,['Arrive','Leave']) && $act->tgt && !$act->obj) {
$act->obj = $act->tgt;
}
@ -4759,15 +4759,15 @@ class Activity
return match (trim($options_arr[0])) {
'activitypub' => q(
"select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_hash = '%s' $sql_options ",
"select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_hash = '%s' $sql_options order by hubloc_id DESC ",
dbesc($url)
),
'zot6', 'nomad' => q(
"select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_id_url = '%s' $sql_options ",
"select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_id_url = '%s' $sql_options order by hubloc_id DESC ",
dbesc($url)
),
default => q(
"select * from hubloc left join xchan on hubloc_hash = xchan_hash where ( hubloc_id_url = '%s' OR hubloc_hash = '%s' ) $sql_options ",
"select * from hubloc left join xchan on hubloc_hash = xchan_hash where ( hubloc_id_url = '%s' OR hubloc_hash = '%s' ) $sql_options order by hubloc_id DESC ",
dbesc($url),
dbesc($url)
),

2
Code/Lib/LDSignatures.php
View file

@ -16,7 +16,7 @@ class LDSignatures
$dhash = self::hash(self::signable_data($data));
$x = Crypto::verify($ohash . $dhash, base64_decode($data['signature']['signatureValue']), $pubkey);
logger('LD-verify: ' . (intval($x)) ? 'true' : 'false');
logger('LD-verify: ' . ((intval($x)) ? 'true' : 'false'));
return $x;
}

20
doc/guide/en/Content_Filters.mc
View file

@ -21,31 +21,33 @@ Then, any filters under **Only import posts with this text** are applied. Only m
**Any text that doesn't start with one of the following: lang= lang!= # $ ? /**
Case-insensitive text match
Example: `covid` (matches "covid", "COVID", "Covid", etc)
Example: `apple` (matches "apple", "APPLE", "Apples", "pineapple", "applesauce", etc.)
Example: `low sub` (matches "low sub", "low sub-zero", "Yellow Submarine", etc.)
NOTE: Beware of using short character sequences that will match many different words. You may want to use REGULAR EXPRESSIONS (see below).
**LANGUAGE**
**lang=**
Match language if it can be identified
Match language (if it can be identified)
Example: `lang=de` (matches German-language content)
**lang!=**
Anything except this language
Match anything except this language (if it can be identified)
Example: `lang!=en` (matches non-English content)
**HASHTAG**
**#[zrl=https://forum.statler.ws/search?tag=%2A%2A]**[/zrl]
**#**
Match hashtag
Example: `#[zrl=https://forum.statler.ws/search?tag=cats%60]cats`[/zrl]
Example: `#cats`
**CATEGORY**
**$**
Match category (requires installing the **Categories** app). Categories are "personal hashtags" that do not generally federate with other instances.
Match category. (Categories are "personal hashtags" that only apply to a single channel. Very few Fediverse platforms support categories. You can enable them for your channel by installing the **Categories** app.)
Example: `$Science`
@ -58,8 +60,9 @@ Discussed below under **Advanced Filters**
**REGULAR EXPRESSIONS (REGEX)**
**/**
Match a "regular expression". See numerous online help sites such as [Regular-Expressions.info](https://www.regular-expressions.info/) for regex assistance.
Match a "regular expression". See numerous online help sites such as [Regular-Expressions.info](https://www.regular-expressions.info/) and [regexr.com](https://regexr.com/) for regex assistance.
Example: `/gr[ae]y/` (matches "gray" and "grey")
Example: `/\b[Ww]ar\b/` (matches the whole words "war" and "War", but not "wars", "warning", "software", etc.)
### Advanced Filters
@ -94,5 +97,4 @@ Example: `?verb == Announce` (matches ActivityPub "boosts")
**?+**
Field match: ?+field item.object
*Usage is undocumented at present*[/share]
@[zrl=https://forum.statler.ws/channel/billstatler]Bill Statler[/zrl]
*Usage is undocumented at present*