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

Don't store object type for verbs (as they don't have it)

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-01-02 16:05:20 +01:00
parent fe328ae5e4
commit 336f099241
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -90,7 +90,7 @@ class Notice extends Managed_DataObject
'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'), 'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
'conversation' => array('type' => 'int', 'description' => 'id of root notice in this conversation'), 'conversation' => array('type' => 'int', 'description' => 'id of root notice in this conversation'),
'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'), 'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
'object_type' => array('type' => 'varchar', 'length' => 191, 'description' => 'URI representing activity streams object type', 'default' => 'http://activitystrea.ms/schema/1.0/note'), 'object_type' => array('type' => 'varchar', 'length' => 191, 'description' => 'URI representing activity streams object type', 'default' => null),
'verb' => array('type' => 'varchar', 'length' => 191, 'description' => 'URI representing activity streams verb', 'default' => 'http://activitystrea.ms/schema/1.0/post'), 'verb' => array('type' => 'varchar', 'length' => 191, 'description' => 'URI representing activity streams verb', 'default' => 'http://activitystrea.ms/schema/1.0/post'),
'scope' => array('type' => 'int', 'scope' => array('type' => 'int',
'description' => 'bit map for distribution scope; 0 = everywhere; 1 = this server only; 2 = addressees; 4 = followers; null = default'), 'description' => 'bit map for distribution scope; 0 = everywhere; 1 = this server only; 2 = addressees; 4 = followers; null = default'),

2
plugins/Activity/ActivityPlugin.php
View File

@ -183,7 +183,7 @@ class ActivityPlugin extends Plugin
'uri' => $uri, 'uri' => $uri,
'verb' => ActivityVerb::UNFAVORITE, 'verb' => ActivityVerb::UNFAVORITE,
'object_type' => (($notice->verb == ActivityVerb::POST) ? 'object_type' => (($notice->verb == ActivityVerb::POST) ?
$notice->object_type : ActivityObject::ACTIVITY))); $notice->object_type : null)));
return true; return true;
} }

1
plugins/Favorite/FavoritePlugin.php
View File

@ -194,7 +194,6 @@ class FavoritePlugin extends ActivityVerbHandlerPlugin
$actobj = $act->objects[0]; $actobj = $act->objects[0];
$object = Fave::saveActivityObject($actobj, $stored); $object = Fave::saveActivityObject($actobj, $stored);
$stored->object_type = $object->getObjectType();
return $object; return $object;
} }

1
plugins/Share/SharePlugin.php
View File

@ -128,7 +128,6 @@ class SharePlugin extends ActivityVerbHandlerPlugin
// Notice::saveActivity it will update the Notice object. // Notice::saveActivity it will update the Notice object.
$stored->repeat_of = $sharedNotice->getID(); $stored->repeat_of = $sharedNotice->getID();
$stored->conversation = $sharedNotice->conversation; $stored->conversation = $sharedNotice->conversation;
$stored->object_type = ActivityUtils::resolveUri(ActivityObject::ACTIVITY, true);
// We don't have to save a repeat in a separate table, we can // We don't have to save a repeat in a separate table, we can
// find repeats by just looking at the notice.repeat_of field. // find repeats by just looking at the notice.repeat_of field.