Commit 507f9a28 authored by abjectio's avatar abjectio

Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

parents 303fa917 5c768d7e
......@@ -33,6 +33,12 @@ class User_group extends Managed_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
public function getObjectType()
{
return ActivityObject::GROUP;
}
public static function schemaDef()
{
return array(
......
......@@ -24,7 +24,7 @@ msgstr ""
#: ActivityPlugin.php:75
#, php-format
msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
msgstr "<a href=\"%1$s\">%2$s</a> började följa <a href=\"%3$s\">%4$s</a."
msgstr "<a href=\"%1$s\">%2$s</a> började följa <a href=\"%3$s\">%4$s</a>."
#. TRANS: Text for "started following" item in activity plugin.
#. TRANS: %1$s is a profile name, %2$s is a profile URL,
......
......@@ -54,6 +54,9 @@ class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin
assert($this->isMyActivity($act));
$stored->object_type = ActivityUtils::resolveUri($act->objects[0]->type);
if (common_valid_http_url($act->objects[0]->link)) {
$stored->url = $act->objects[0]->link;
}
// We don't have to do just about anything for a new, remote notice since the fields
// are handled in the main Notice::saveActivity function. Such as content, attachments,
......
......@@ -138,6 +138,7 @@ class TwitterImport
$notice->profile_id = $profile->id;
$notice->uri = $statusUri;
$notice->url = $statusUri;
$notice->verb = ActivityVerb::POST;
$notice->created = strftime(
'%Y-%m-%d %H:%M:%S',
strtotime($status->created_at)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment