eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
abjectio
2015-11-05 17:34:34 +01:00
parent 303fa91720 5c768d7ef7
commit 507f9a28c0
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/User_group.php
View File

@@ -33,6 +33,12 @@ class User_group extends Managed_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
public function getObjectType()
{
return ActivityObject::GROUP;
}
public static function schemaDef() public static function schemaDef()
{ {
return array( return array(

2
plugins/Activity/locale/sv/LC_MESSAGES/Activity.po
View File

@@ -24,7 +24,7 @@ msgstr ""
#: ActivityPlugin.php:75 #: ActivityPlugin.php:75
#, php-format #, php-format
msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>." 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: Text for "started following" item in activity plugin.
#. TRANS: %1$s is a profile name, %2$s is a profile URL, #. TRANS: %1$s is a profile name, %2$s is a profile URL,

3
plugins/ActivityVerbPost/ActivityVerbPostPlugin.php
View File

@@ -54,6 +54,9 @@ class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin
assert($this->isMyActivity($act)); assert($this->isMyActivity($act));
$stored->object_type = ActivityUtils::resolveUri($act->objects[0]->type); $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 // 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, // are handled in the main Notice::saveActivity function. Such as content, attachments,

1
plugins/TwitterBridge/lib/twitterimport.php
View File

@@ -138,6 +138,7 @@ class TwitterImport
$notice->profile_id = $profile->id; $notice->profile_id = $profile->id;
$notice->uri = $statusUri; $notice->uri = $statusUri;
$notice->url = $statusUri; $notice->url = $statusUri;
$notice->verb = ActivityVerb::POST;
$notice->created = strftime( $notice->created = strftime(
'%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M:%S',
strtotime($status->created_at) strtotime($status->created_at)