GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CORE][VisibilityScope] Use enum type instead of Bitmap

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro
2021-12-26 17:31:53 +00:00
parent 6f0d9add08
commit a1d9909379
5 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/ActivityPub/Util/Model/Note.php
View File

@@ -170,11 +170,11 @@ class Note extends Model
// Scope
if (\in_array('https://www.w3.org/ns/activitystreams#Public', $type_note->get('to'))) {
// Public: Visible for all, shown in public feeds
$map['scope'] = VisibilityScope::PUBLIC;
$map['scope'] = VisibilityScope::EVERYWHERE;
} elseif (\in_array('https://www.w3.org/ns/activitystreams#Public', $type_note->get('cc'))) {
// Unlisted: Visible for all but not shown in public feeds
// It isn't the note that dictates what feed is shown in but the feed, it only dictates who can access it.
$map['scope'] = VisibilityScope::PUBLIC;
$map['scope'] = VisibilityScope::EVERYWHERE;
} else {
// Either Followers-only or Direct
if ($type_note->get('directMessage') ?? false // Is DM explicitly?
@@ -327,7 +327,7 @@ class Note extends Model
// Target scope
switch ($object->getScope()) {
case VisibilityScope::PUBLIC:
case VisibilityScope::EVERYWHERE:
$attr['to'] = ['https://www.w3.org/ns/activitystreams#Public'];
$attr['cc'] = [Router::url('actor_subscribers_id', ['id' => $object->getActor()->getId()], Router::ABSOLUTE_URL)];
break;