$a = new App(dirname(__DIR__));
-if (App\Mode::isNormal()) {
+if ($a->getMode()->isNormal()) {
$oAuth = new ExAuth();
$oAuth->readStdin();
-}
\ No newline at end of file
+}
$a = new App(dirname(__DIR__));
-if (App\Mode::isInstall()) {
+if ($a->getMode()->isInstall()) {
die("Friendica isn't properly installed yet.\n");
}
"phpunit/dbunit": "^2.0",
"phpdocumentor/reflection-docblock": "^3.0.2",
"phpunit/php-token-stream": "^1.4.2",
- "mikey179/vfsStream": "^1.6"
+ "mikey179/vfsStream": "^1.6",
+ "mockery/mockery": "^1.2"
},
"scripts": {
"test": "phpunit"
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "c2306df3b19ec46d53bb16ac2cffa51a",
+ "content-hash": "9f0dbeccbae197460a0ce74a940177cd",
"packages": [
{
"name": "asika/simple-console",
"reference": null,
"shasum": "30dc7a7ce872155b23a33bd10ad4c76c0d613f55"
},
+ "require-dev": {
+ "npm-asset/babel-core": ">=6.26.0,<7.0.0",
+ "npm-asset/babel-plugin-external-helpers": ">=6.22.0,<7.0.0",
+ "npm-asset/babel-preset-env": ">=1.6.1,<2.0.0",
+ "npm-asset/cpy-cli": ">=1.0.1,<2.0.0",
+ "npm-asset/cssnano": ">=3.10.0,<4.0.0",
+ "npm-asset/del-cli": ">=1.1.0,<2.0.0",
+ "npm-asset/eslint": ">=4.14.0,<5.0.0",
+ "npm-asset/eslint-config-airbnb-base": ">=12.1.0,<13.0.0",
+ "npm-asset/eslint-plugin-import": ">=2.8.0,<3.0.0",
+ "npm-asset/node-qunit-phantomjs": ">=2.0.0,<3.0.0",
+ "npm-asset/npm-run-all": ">=4.1.2,<5.0.0",
+ "npm-asset/postcss-cli": ">=4.1.1,<5.0.0",
+ "npm-asset/postcss-cssnext": ">=3.0.2,<4.0.0",
+ "npm-asset/postcss-header": ">=1.0.0,<2.0.0",
+ "npm-asset/postcss-url": ">=7.3.0,<8.0.0",
+ "npm-asset/rollup": ">=0.53.3,<0.54.0",
+ "npm-asset/rollup-plugin-babel": ">=3.0.3,<4.0.0",
+ "npm-asset/rollup-watch": ">=4.3.1,<5.0.0",
+ "npm-asset/stylefmt": ">=6.0.0,<7.0.0",
+ "npm-asset/uglify-js": ">=3.3.4,<4.0.0"
+ },
"type": "npm-asset-library",
"extra": {
"npm-asset-bugs": {
"require": {
"npm-asset/ev-emitter": ">=1.0.0,<2.0.0"
},
+ "require-dev": {
+ "npm-asset/chalk": ">=1.1.1,<2.0.0",
+ "npm-asset/cheerio": ">=0.19.0,<0.20.0",
+ "npm-asset/gulp": ">=3.9.0,<4.0.0",
+ "npm-asset/gulp-jshint": ">=1.11.2,<2.0.0",
+ "npm-asset/gulp-json-lint": ">=0.1.0,<0.2.0",
+ "npm-asset/gulp-rename": ">=1.2.2,<2.0.0",
+ "npm-asset/gulp-replace": ">=0.5.4,<0.6.0",
+ "npm-asset/gulp-requirejs-optimize": "dev-github:metafizzy/gulp-requirejs-optimize",
+ "npm-asset/gulp-uglify": ">=1.4.2,<2.0.0",
+ "npm-asset/gulp-util": ">=3.0.7,<4.0.0",
+ "npm-asset/highlight.js": ">=8.9.1,<9.0.0",
+ "npm-asset/marked": ">=0.3.5,<0.4.0",
+ "npm-asset/minimist": ">=1.2.0,<2.0.0",
+ "npm-asset/transfob": ">=1.0.0,<2.0.0"
+ },
"type": "npm-asset-library",
"extra": {
"npm-asset-bugs": {
"reference": null,
"shasum": "2736e332aaee73ccf0a14a5f0066391a0a13f4a3"
},
+ "require-dev": {
+ "npm-asset/grunt": "~0.4.2",
+ "npm-asset/grunt-contrib-cssmin": "~0.9.0",
+ "npm-asset/grunt-contrib-jshint": "~0.6.3",
+ "npm-asset/grunt-contrib-less": "~0.11.0",
+ "npm-asset/grunt-contrib-uglify": "~0.4.0",
+ "npm-asset/grunt-contrib-watch": "~0.6.1"
+ },
"type": "npm-asset-library",
"extra": {
"npm-asset-bugs": {
"reference": null,
"shasum": "2c89d6889b5eac522a7eea32c14521559c6cbf02"
},
+ "require-dev": {
+ "npm-asset/commitplease": "2.0.0",
+ "npm-asset/core-js": "0.9.17",
+ "npm-asset/grunt": "0.4.5",
+ "npm-asset/grunt-babel": "5.0.1",
+ "npm-asset/grunt-cli": "0.1.13",
+ "npm-asset/grunt-compare-size": "0.4.0",
+ "npm-asset/grunt-contrib-jshint": "0.11.2",
+ "npm-asset/grunt-contrib-uglify": "0.9.2",
+ "npm-asset/grunt-contrib-watch": "0.6.1",
+ "npm-asset/grunt-git-authors": "2.0.1",
+ "npm-asset/grunt-jscs": "2.1.0",
+ "npm-asset/grunt-jsonlint": "1.0.4",
+ "npm-asset/grunt-npmcopy": "0.1.0",
+ "npm-asset/gzip-js": "0.3.2",
+ "npm-asset/jsdom": "5.6.1",
+ "npm-asset/load-grunt-tasks": "1.0.0",
+ "npm-asset/qunit-assert-step": "1.0.3",
+ "npm-asset/qunitjs": "1.17.1",
+ "npm-asset/requirejs": "2.1.17",
+ "npm-asset/sinon": "1.10.3",
+ "npm-asset/sizzle": "2.2.1",
+ "npm-asset/strip-json-comments": "1.0.3",
+ "npm-asset/testswarm": "1.1.0",
+ "npm-asset/win-spawn": "2.0.0"
+ },
"type": "npm-asset-library",
"extra": {
"npm-asset-bugs": {
"reference": null,
"shasum": "06f0335f16e353a695e7206bf50503cb523a6ee5"
},
+ "require-dev": {
+ "npm-asset/grunt": "~0.4.1",
+ "npm-asset/grunt-contrib-connect": "~0.5.0",
+ "npm-asset/grunt-contrib-jshint": "~0.7.1",
+ "npm-asset/grunt-contrib-uglify": "~0.2.7"
+ },
"type": "npm-asset-library",
"extra": {
"npm-asset-bugs": {
],
"time": "2015-06-14T21:17:01+00:00"
},
+ {
+ "name": "hamcrest/hamcrest-php",
+ "version": "v2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/hamcrest/hamcrest-php.git",
+ "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad",
+ "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3|^7.0"
+ },
+ "replace": {
+ "cordoval/hamcrest-php": "*",
+ "davedevelopment/hamcrest-php": "*",
+ "kodova/hamcrest-php": "*"
+ },
+ "require-dev": {
+ "phpunit/php-file-iterator": "1.3.3",
+ "phpunit/phpunit": "~4.0",
+ "satooshi/php-coveralls": "^1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "hamcrest"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD"
+ ],
+ "description": "This is the PHP port of Hamcrest Matchers",
+ "keywords": [
+ "test"
+ ],
+ "time": "2016-01-20T08:20:44+00:00"
+ },
{
"name": "mikey179/vfsStream",
"version": "v1.6.5",
"homepage": "http://vfs.bovigo.org/",
"time": "2017-08-01T08:02:14+00:00"
},
+ {
+ "name": "mockery/mockery",
+ "version": "1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/mockery/mockery.git",
+ "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
+ "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
+ "shasum": ""
+ },
+ "require": {
+ "hamcrest/hamcrest-php": "~2.0",
+ "lib-pcre": ">=7.0",
+ "php": ">=5.6.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "Mockery": "library/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Pádraic Brady",
+ "email": "padraic.brady@gmail.com",
+ "homepage": "http://blog.astrumfutura.com"
+ },
+ {
+ "name": "Dave Marshall",
+ "email": "dave.marshall@atstsolutions.co.uk",
+ "homepage": "http://davedevelopment.co.uk"
+ }
+ ],
+ "description": "Mockery is a simple yet flexible PHP mock object framework",
+ "homepage": "https://github.com/mockery/mockery",
+ "keywords": [
+ "BDD",
+ "TDD",
+ "library",
+ "mock",
+ "mock objects",
+ "mockery",
+ "stub",
+ "test",
+ "test double",
+ "testing"
+ ],
+ "time": "2018-10-02T21:52:37+00:00"
+ },
{
"name": "myclabs/deep-copy",
"version": "1.7.0",
}
],
"description": "Provides the functionality to compare PHP values for equality",
- "homepage": "http://www.github.com/sebastianbergmann/comparator",
+ "homepage": "https://github.com/sebastianbergmann/comparator",
"keywords": [
"comparator",
"compare",
}
],
"description": "Provides functionality to handle HHVM/PHP environments",
- "homepage": "http://www.github.com/sebastianbergmann/environment",
+ "homepage": "https://github.com/sebastianbergmann/environment",
"keywords": [
"Xdebug",
"environment",
}
],
"description": "Provides the functionality to export PHP variables for visualization",
- "homepage": "http://www.github.com/sebastianbergmann/exporter",
+ "homepage": "https://github.com/sebastianbergmann/exporter",
"keywords": [
"export",
"exporter"
}
],
"description": "Snapshotting of global state",
- "homepage": "http://www.github.com/sebastianbergmann/global-state",
+ "homepage": "https://github.com/sebastianbergmann/global-state",
"keywords": [
"global state"
],
}
],
"description": "Provides functionality to recursively process PHP variables",
- "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+ "homepage": "https://github.com/sebastianbergmann/recursion-context",
"time": "2016-11-19T07:33:16+00:00"
},
{
-- ------------------------------------------
-- Friendica 2018.12-dev (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1283
+-- DB_UPDATE_VERSION 1284
-- ------------------------------------------
UNIQUE INDEX `name` (`name`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registered addons';
+--
+-- TABLE apcontact
+--
+CREATE TABLE IF NOT EXISTS `apcontact` (
+ `url` varbinary(255) NOT NULL COMMENT 'URL of the contact',
+ `uuid` varchar(255) COMMENT '',
+ `type` varchar(20) NOT NULL COMMENT '',
+ `following` varchar(255) COMMENT '',
+ `followers` varchar(255) COMMENT '',
+ `inbox` varchar(255) NOT NULL COMMENT '',
+ `outbox` varchar(255) COMMENT '',
+ `sharedinbox` varchar(255) COMMENT '',
+ `nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `name` varchar(255) COMMENT '',
+ `about` text COMMENT '',
+ `photo` varchar(255) COMMENT '',
+ `addr` varchar(255) COMMENT '',
+ `alias` varchar(255) COMMENT '',
+ `pubkey` text COMMENT '',
+ `baseurl` varchar(255) COMMENT 'baseurl of the ap contact',
+ `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+ PRIMARY KEY(`url`),
+ INDEX `addr` (`addr`(32)),
+ INDEX `url` (`followers`(190))
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='ActivityPub compatible contacts - used in the ActivityPub implementation';
+
--
-- TABLE attach
--
`reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'URI to which this item is a reply',
`conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation URI',
`conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation link',
- `protocol` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The protocol of the item',
+ `protocol` tinyint unsigned NOT NULL DEFAULT 255 COMMENT 'The protocol of the item',
`source` mediumtext COMMENT 'Original source',
`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Receiving date',
PRIMARY KEY(`item-uri`),
require_once "include/dba.php";
// Missing DB connection: ERROR
-if (App\Mode::has(App\Mode::LOCALCONFIGPRESENT) && !App\Mode::has(App\Mode::DBAVAILABLE)) {
+if ($a->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$a->getMode()->has(App\Mode::DBAVAILABLE)) {
System::httpExit(500, ['title' => 'Error 500 - Internal Server Error', 'description' => 'Apologies but the website is unavailable at the moment.']);
}
System::httpExit(503, ['title' => 'Error 503 - Service Temporarily Unavailable', 'description' => 'System is currently overloaded. Please try again later.']);
}
-if (!App\Mode::isInstall()) {
+if (!$a->getMode()->isInstall()) {
if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http")
&& (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL)
&& (substr(System::baseUrl(), 0, 8) == "https://")
L10n::loadTranslationTable($lang);
}
-if (!empty($_GET['zrl']) && App\Mode::isNormal()) {
+if (!empty($_GET['zrl']) && $a->getMode()->isNormal()) {
$a->query_string = Profile::stripZrls($a->query_string);
if (!local_user()) {
// Only continue when the given profile link seems valid
}
}
-if (!empty($_GET['owt']) && App\Mode::isNormal()) {
+if (!empty($_GET['owt']) && $a->getMode()->isNormal()) {
$token = $_GET['owt'];
$a->query_string = Profile::stripQueryParam($a->query_string, 'owt');
Profile::openWebAuthInit($token);
// in install mode, any url loads install module
// but we need "view" module for stylesheet
-if (App\Mode::isInstall() && $a->module != 'view') {
+if ($a->getMode()->isInstall() && $a->module != 'view') {
$a->module = 'install';
-} elseif (!App\Mode::has(App\Mode::MAINTENANCEDISABLED) && $a->module != 'view') {
+} elseif (!$a->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $a->module != 'view') {
$a->module = 'maintenance';
} else {
check_url($a);
/* initialise content region */
-if (App\Mode::isNormal()) {
+if ($a->getMode()->isNormal()) {
Addon::callHooks('page_content_top', $a->page['content']);
}
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Core\ACL;
+use Friendica\Module\Login;
function contacts_init(App $a)
{
if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL);
- return;
+ return Login::form();
}
if ($a->argc == 3) {
use Friendica\Model\Profile;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
+use Friendica\Module\Login;
require_once 'include/items.php';
{
if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL);
- return;
+ return Login::form();
}
if ($a->argc == 1) {
$hash = random_string();
- $note = escape_tags(trim($_POST['note']));
+ $note = escape_tags(trim(defaults($_POST, 'note', '')));
if ($new_contact) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Temporal;
+use Friendica\Module\Login;
require_once 'include/conversation.php';
if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL);
- return;
+ return Login::form();
}
$myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\Module\Login;
function notifications_post(App $a)
{
{
if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL);
- return;
+ return Login::form();
}
$page = defaults($_REQUEST, 'page', 1);
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
+use Friendica\Module\Login;
function profiles_init(App $a) {
if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL);
- return;
+ return Login::form();
}
$o = '';
use Friendica\Protocol\Email;
use Friendica\Util\Network;
use Friendica\Util\Temporal;
+use Friendica\Module\Login;
function get_theme_config_file($theme)
{
if (!local_user()) {
//notice(L10n::t('Permission denied.') . EOL);
- return;
+ return Login::form();
}
if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\Network\HTTPException\InternalServerErrorException;
require_once 'boot.php';
require_once 'include/dba.php';
public $stylesheets = [];
public $footerScripts = [];
+ /**
+ * @var App\Mode The Mode of the Application
+ */
+ private $mode;
+
/**
* Register a stylesheet file path to be included in the <head> tag of every page.
* Inclusion is done in App->initHead().
$this->callstack['rendering'] = [];
$this->callstack['parser'] = [];
+ $this->mode = new App\Mode($basepath);
+
$this->reload();
set_time_limit(0);
$this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
}
+ /**
+ * Returns the Mode of the Application
+ *
+ * @return App\Mode The Application Mode
+ *
+ * @throws InternalServerErrorException when the mode isn't created
+ */
+ public function getMode()
+ {
+ if (empty($this->mode)) {
+ throw new InternalServerErrorException('Mode of the Application is not defined');
+ }
+
+ return $this->mode;
+ }
+
/**
* Reloads the whole app instance
*/
$this->loadDatabase();
- App\Mode::determine($this->basepath);
+ $this->getMode()->determine($this->basepath);
$this->determineUrlPath();
Config::load();
- if (App\Mode::has(App\Mode::DBAVAILABLE)) {
+ if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
Core\Addon::loadHooks();
$this->loadAddonConfig();
*/
public function getCurrentTheme()
{
- if (App\Mode::isInstall()) {
+ if ($this->getMode()->isInstall()) {
return '';
}
/***
* @var int the mode of this Application
*
- * Default is 0 (= not set)
*/
- private static $mode = 0;
+ private $mode;
+
+ /**
+ * @var string the basepath of the application
+ */
+ private $basepath;
+
+ public function __construct($basepath = '')
+ {
+ $this->basepath = $basepath;
+ $this->mode = 0;
+ }
/**
* Sets the App mode
* @param string $basepath the Basepath of the Application
*
*/
- public static function determine($basepath)
+ public function determine($basepath = null)
{
- self::$mode = 0;
+ if (!empty($basepath)) {
+ $this->basepath = $basepath;
+ }
+
+ $this->mode = 0;
- if (!file_exists($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')
- && !file_exists($basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) {
+ if (!file_exists($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')
+ && !file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) {
return;
}
- self::$mode |= Mode::LOCALCONFIGPRESENT;
+ $this->mode |= Mode::LOCALCONFIGPRESENT;
if (!DBA::connected()) {
return;
}
- self::$mode |= Mode::DBAVAILABLE;
+ $this->mode |= Mode::DBAVAILABLE;
if (DBA::fetchFirst("SHOW TABLES LIKE 'config'") === false) {
return;
}
- self::$mode |= Mode::DBCONFIGAVAILABLE;
+ $this->mode |= Mode::DBCONFIGAVAILABLE;
if (Config::get('system', 'maintenance')) {
return;
}
- self::$mode |= Mode::MAINTENANCEDISABLED;
+ $this->mode |= Mode::MAINTENANCEDISABLED;
}
/**
*
* @return bool returns true, if the mode is set
*/
- public static function has($mode)
+ public function has($mode)
{
- return self::$mode & $mode;
+ return ($this->mode & $mode) > 0;
}
*
* @return bool
*/
- public static function isInstall()
+ public function isInstall()
{
- return !self::has(Mode::LOCALCONFIGPRESENT) ||
- !self::has(MODE::DBCONFIGAVAILABLE);
+ return !$this->has(Mode::LOCALCONFIGPRESENT) ||
+ !$this->has(MODE::DBCONFIGAVAILABLE);
}
/**
*
* @return bool
*/
- public static function isNormal()
+ public function isNormal()
{
- return self::has(Mode::LOCALCONFIGPRESENT) &&
- self::has(Mode::DBAVAILABLE) &&
- self::has(Mode::DBCONFIGAVAILABLE) &&
- self::has(Mode::MAINTENANCEDISABLED);
+ return $this->has(Mode::LOCALCONFIGPRESENT) &&
+ $this->has(Mode::DBAVAILABLE) &&
+ $this->has(Mode::DBCONFIGAVAILABLE) &&
+ $this->has(Mode::MAINTENANCEDISABLED);
}
}
public static function init()
{
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return;
}
public static function load($family = "config")
{
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return;
}
public static function get($family, $key, $default_value = null, $refresh = false)
{
// Database isn't ready or populated yet, fallback to file config
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return self::getApp()->getConfigValue($family, $key, $default_value);
}
public static function set($family, $key, $value)
{
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return false;
}
public static function delete($family, $key)
{
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return false;
}
protected function doExecute()
{
- $a = get_app();
+ $a = \Friendica\BaseObject::getApp();
if ($this->getOption('v')) {
$this->out('Class: ' . __CLASS__);
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
- if (App\Mode::isInstall()) {
+ if ($a->getMode()->isInstall()) {
throw new RuntimeException('Friendica isn\'t properly installed yet.');
}
$this->out('Options: ' . var_export($this->options, true));
}
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if ($a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
$this->out('Database isn\'t ready or populated yet, database cache won\'t be available');
}
throw new CommandArgsException('Too many arguments');
}
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!$a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
$this->out('Database isn\'t ready or populated yet, showing file config only');
}
if (count($this->args) == 0) {
Core\Config::load();
- if (Core\Config::get('system', 'config_adapter') == 'jit' && App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (Core\Config::get('system', 'config_adapter') == 'jit' && $a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
$this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
}
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
- if (App\Mode::isInstall()) {
+ if ($a->getMode()->isInstall()) {
throw new \RuntimeException('Database isn\'t ready or populated yet');
}
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
- if (App\Mode::isInstall()) {
+ if ($a->getMode()->isInstall()) {
throw new RuntimeException('Database isn\'t ready or populated yet');
}
protected function doExecute()
{
- $a = get_app();
+ $a = \Friendica\BaseObject::getApp();
if ($this->getOption('v')) {
$this->out('Class: ' . __CLASS__);
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
- if (App\Mode::isInstall()) {
+ if ($a->getMode()->isInstall()) {
throw new \RuntimeException('Database isn\'t ready or populated yet');
}
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
- if (App\Mode::isInstall()) {
+ if ($a->getMode()->isInstall()) {
throw new RuntimeException('Database isn\'t ready or populated yet');
}
protected function doExecute()
{
- $a = get_app();
+ $a = \Friendica\BaseObject::getApp();
if ($this->getOption($this->helpOptions)) {
$this->out($this->getHelp());
return 0;
}
- if (App\Mode::isInstall()) {
+ if ($a->getMode()->isInstall()) {
throw new \RuntimeException('Database isn\'t ready or populated yet');
}
public static function init($uid)
{
+ $a = self::getApp();
+
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!$a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return;
}
- if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
+ if ($a->getConfigValue('system', 'config_adapter') == 'preload') {
self::$adapter = new Config\PreloadPConfigAdapter($uid);
} else {
self::$adapter = new Config\JITPConfigAdapter($uid);
public static function load($uid, $family)
{
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return;
}
public static function get($uid, $family, $key, $default_value = null, $refresh = false)
{
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return;
}
public static function set($uid, $family, $key, $value)
{
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return false;
}
public static function delete($uid, $family, $key)
{
// Database isn't ready or populated yet
- if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+ if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
return false;
}
public static function post()
{
+ $return_url = $_SESSION['return_url'];
session_unset();
+ $_SESSION['return_url'] = $return_url;
+
// OpenId Login
if (
empty($_POST['password'])
'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
- const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image'];
- const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'];
/**
* Checks if the web request is done for the AP protocol
*
}
foreach ($items as $activity) {
- ActivityPub\Receiver::processActivity($activity, '', $uid, true);
+ $ldactivity = JsonLD::compact($activity);
+ ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
}
}
}
$tag_text = '';
foreach ($tags as $tag) {
- if (in_array($tag['type'], ['Mention', 'Hashtag'])) {
+ if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag'])) {
if (!empty($tag_text)) {
$tag_text .= ',';
}
}
/**
- *
+ * Add attachment data to the item array
*
- * @param $attachments
+ * @param array $attachments
* @param array $item
*
* @return item array
}
/**
- *
+ * Prepares data for a message
*
- * @param array $activity
- * @param $body
+ * @param array $activity Activity array
+ * @param string $body original source
*/
public static function createItem($activity, $body)
{
}
/**
- *
+ * Prepare the item array for a "like"
*
- * @param array $activity
- * @param $body
+ * @param array $activity Activity array
+ * @param string $body original source
*/
public static function likeItem($activity, $body)
{
$item = [];
$item['verb'] = ACTIVITY_LIKE;
- $item['parent-uri'] = $activity['object'];
+ $item['parent-uri'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE;
* Delete items
*
* @param array $activity
- * @param $body
*/
public static function deleteItem($activity)
{
- $owner = Contact::getIdForURL($activity['owner']);
- $object = JsonLD::fetchElement($activity, 'object', 'id');
- logger('Deleting item ' . $object . ' from ' . $owner, LOGGER_DEBUG);
- Item::delete(['uri' => $object, 'owner-id' => $owner]);
+ $owner = Contact::getIdForURL($activity['actor']);
+
+ logger('Deleting item ' . $activity['object_id'] . ' from ' . $owner, LOGGER_DEBUG);
+ Item::delete(['uri' => $activity['object_id'], 'owner-id' => $owner]);
}
/**
- *
+ * Prepare the item array for a "dislike"
*
- * @param array $activity
- * @param $body
+ * @param array $activity Activity array
+ * @param string $body original source
*/
public static function dislikeItem($activity, $body)
{
$item = [];
$item['verb'] = ACTIVITY_DISLIKE;
- $item['parent-uri'] = $activity['object'];
+ $item['parent-uri'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE;
}
/**
- *
+ * Creates an item post
*
- * @param array $activity
- * @param array $item
- * @param $body
+ * @param array $activity Activity data
+ * @param array $item item array
+ * @param string $body original source
*/
private static function postItem($activity, $item, $body)
{
$item['network'] = Protocol::ACTIVITYPUB;
$item['private'] = !in_array(0, $activity['receiver']);
$item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
- $item['owner-id'] = Contact::getIdForURL($activity['owner'], 0, true);
+ $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
$item['uri'] = $activity['id'];
$item['created'] = $activity['published'];
$item['edited'] = $activity['updated'];
$item = self::constructAttachList($activity['attachments'], $item);
- $source = JsonLD::fetchElement($activity, 'source', 'content', 'mediaType', 'text/bbcode');
- if (!empty($source)) {
- $item['body'] = $source;
+ if (!empty($activity['source'])) {
+ $item['body'] = $activity['source'];
}
$item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
}
/**
- *
+ * Fetches missing posts
*
* @param $url
* @param $child
$activity['published'] = $object['published'];
$activity['type'] = 'Create';
- ActivityPub\Receiver::processActivity($activity);
+ $ldactivity = JsonLD::compact($activity);
+ ActivityPub\Receiver::processActivity($ldactivity);
logger('Activity ' . $url . ' had been fetched and processed.');
}
*/
public static function followUser($activity)
{
- $actor = JsonLD::fetchElement($activity, 'object', 'id');
- $uid = User::getIdForURL($actor);
+ $uid = User::getIdForURL($activity['object_id']);
if (empty($uid)) {
return;
}
$owner = User::getOwnerDataById($uid);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (!empty($cid)) {
$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
} else {
$contact = false;
}
- $item = ['author-id' => Contact::getIdForURL($activity['owner']),
- 'author-link' => $activity['owner']];
+ $item = ['author-id' => Contact::getIdForURL($activity['actor']),
+ 'author-link' => $activity['actor']];
Contact::addRelationship($owner, $contact, $item);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
return;
}
*/
public static function updatePerson($activity)
{
- if (empty($activity['object']['id'])) {
+ if (empty($activity['object_id'])) {
return;
}
- logger('Updating profile for ' . $activity['object']['id'], LOGGER_DEBUG);
- APContact::getByURL($activity['object']['id'], true);
+ logger('Updating profile for ' . $activity['object_id'], LOGGER_DEBUG);
+ APContact::getByURL($activity['object_id'], true);
}
/**
*/
public static function deletePerson($activity)
{
- if (empty($activity['object']['id']) || empty($activity['object']['actor'])) {
+ if (empty($activity['object_id']) || empty($activity['actor'])) {
logger('Empty object id or actor.', LOGGER_DEBUG);
return;
}
- if ($activity['object']['id'] != $activity['object']['actor']) {
+ if ($activity['object_id'] != $activity['actor']) {
logger('Object id does not match actor.', LOGGER_DEBUG);
return;
}
- $contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object']['id'])]);
+ $contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object_id'])]);
while ($contact = DBA::fetch($contacts)) {
- Contact::remove($contact["id"]);
+ Contact::remove($contact['id']);
}
DBA::close($contacts);
- logger('Deleted contact ' . $activity['object']['id'], LOGGER_DEBUG);
+ logger('Deleted contact ' . $activity['object_id'], LOGGER_DEBUG);
}
/**
*/
public static function acceptFollowUser($activity)
{
- $actor = JsonLD::fetchElement($activity, 'object', 'actor');
- $uid = User::getIdForURL($actor);
+ $uid = User::getIdForURL($activity['object_actor']);
if (empty($uid)) {
return;
}
$owner = User::getOwnerDataById($uid);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
- logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return;
}
*/
public static function rejectFollowUser($activity)
{
- $actor = JsonLD::fetchElement($activity, 'object', 'actor');
- $uid = User::getIdForURL($actor);
+ $uid = User::getIdForURL($activity['object_actor']);
if (empty($uid)) {
return;
}
$owner = User::getOwnerDataById($uid);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
- logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return;
}
*/
public static function undoActivity($activity)
{
- $activity_url = JsonLD::fetchElement($activity, 'object', 'id');
- if (empty($activity_url)) {
+ if (empty($activity['object_id'])) {
return;
}
- $actor = JsonLD::fetchElement($activity, 'object', 'actor');
- if (empty($actor)) {
+ if (empty($activity['object_actor'])) {
return;
}
- $author_id = Contact::getIdForURL($actor);
+ $author_id = Contact::getIdForURL($activity['object_actor']);
if (empty($author_id)) {
return;
}
- Item::delete(['uri' => $activity_url, 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+ Item::delete(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
}
/**
*/
public static function undoFollowUser($activity)
{
- $object = JsonLD::fetchElement($activity, 'object', 'object');
- $uid = User::getIdForURL($object);
+ $uid = User::getIdForURL($activity['object_object']);
if (empty($uid)) {
return;
}
$owner = User::getOwnerDataById($uid);
- $cid = Contact::getIdForURL($activity['owner'], $uid);
+ $cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
- logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ logger('No contact found for ' . $activity['actor'], LOGGER_DEBUG);
return;
}
* - Remove
* - Undo Block
* - Undo Accept (Problem: This could invert a contact accept or an event accept)
- *
- * General:
- * - Possibly using the LD-JSON parser
*/
class Receiver
{
+ const PUBLIC_COLLECTION = 'as:Public';
+ const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application'];
+ const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image'];
+ const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept'];
+
/**
* Checks if the web request is done for the AP protocol
*
}
/**
- *
+ * Checks incoming message from the inbox
*
* @param $body
* @param $header
$activity = json_decode($body, true);
- $actor = JsonLD::fetchElement($activity, 'actor', 'id');
- logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
-
if (empty($activity)) {
logger('Invalid body.', LOGGER_DEBUG);
return;
}
+ $ldactivity = JsonLD::compact($activity);
+
+ $actor = JsonLD::fetchElement($ldactivity, 'as:actor');
+
+ logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
+
if (LDSignature::isSigned($activity)) {
$ld_signer = LDSignature::getSigner($activity);
if (empty($ld_signer)) {
$trust_source = false;
}
- self::processActivity($activity, $body, $uid, $trust_source);
+ self::processActivity($ldactivity, $body, $uid, $trust_source);
}
/**
- *
+ * Fetches the object type for a given object id
+ *
+ * @param array $activity
+ * @param string $object_id Object ID of the the provided object
+ *
+ * @return string with object type
+ */
+ private static function fetchObjectType($activity, $object_id)
+ {
+
+ $object_type = JsonLD::fetchElement($activity['as:object'], '@type');
+ if (!empty($object_type)) {
+ return $object_type;
+ }
+
+ if (Item::exists(['uri' => $object_id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]])) {
+ // We just assume "note" since it doesn't make a difference for the further processing
+ return 'as:Note';
+ }
+
+ $profile = APContact::getByURL($object_id);
+ if (!empty($profile['type'])) {
+ return 'as:' . $profile['type'];
+ }
+
+ $data = ActivityPub::fetchContent($object_id);
+ if (!empty($data)) {
+ $object = JsonLD::compact($data);
+ $type = JsonLD::fetchElement($object, '@type');
+ if (!empty($type)) {
+ return $type;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Prepare the object array
*
* @param array $activity
* @param integer $uid User ID
* @param $trust_source
*
- * @return
+ * @return array with object data
*/
private static function prepareObjectData($activity, $uid, &$trust_source)
{
- $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+ $actor = JsonLD::fetchElement($activity, 'as:actor');
if (empty($actor)) {
logger('Empty actor', LOGGER_DEBUG);
return [];
}
+ $type = JsonLD::fetchElement($activity, '@type');
+
// Fetch all receivers from to, cc, bto and bcc
$receivers = self::getReceivers($activity, $actor);
logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
- $object_id = JsonLD::fetchElement($activity, 'object', 'id');
+ $object_id = JsonLD::fetchElement($activity, 'as:object');
if (empty($object_id)) {
logger('No object found', LOGGER_DEBUG);
return [];
}
+ $object_type = self::fetchObjectType($activity, $object_id);
+
// Fetch the content only on activities where this matters
- if (in_array($activity['type'], ['Create', 'Announce'])) {
- $object_data = self::fetchObject($object_id, $activity['object'], $trust_source);
+ if (in_array($type, ['as:Create', 'as:Announce'])) {
+ if ($type == 'as:Announce') {
+ $trust_source = false;
+ }
+ $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source);
if (empty($object_data)) {
logger("Object data couldn't be processed", LOGGER_DEBUG);
return [];
}
// We had been able to retrieve the object data - so we can trust the source
$trust_source = true;
- } elseif (in_array($activity['type'], ['Like', 'Dislike'])) {
+ } elseif (in_array($type, ['as:Like', 'as:Dislike'])) {
// Create a mostly empty array out of the activity data (instead of the object).
// This way we later don't have to check for the existence of ech individual array element.
$object_data = self::processObject($activity);
- $object_data['name'] = $activity['type'];
- $object_data['author'] = $activity['actor'];
- $object_data['object'] = $object_id;
+ $object_data['name'] = $type;
+ $object_data['author'] = JsonLD::fetchElement($activity, 'as:actor');
+ $object_data['object_id'] = $object_id;
$object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type
} else {
$object_data = [];
- $object_data['id'] = $activity['id'];
- $object_data['object'] = $activity['object'];
- $object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
+ $object_data['id'] = JsonLD::fetchElement($activity, '@id');
+ $object_data['object_id'] = JsonLD::fetchElement($activity, 'as:object');
+ $object_data['object_actor'] = JsonLD::fetchElement($activity['as:object'], 'as:actor');
+ $object_data['object_object'] = JsonLD::fetchElement($activity['as:object'], 'as:object');
+ $object_data['object_type'] = JsonLD::fetchElement($activity['as:object'], '@type');
}
$object_data = self::addActivityFields($object_data, $activity);
- $object_data['type'] = $activity['type'];
- $object_data['owner'] = $actor;
+ if (empty($object_data['object_type'])) {
+ $object_data['object_type'] = $object_type;
+ }
+
+ $object_data['type'] = $type;
+ $object_data['actor'] = $actor;
$object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
logger('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], LOGGER_DEBUG);
}
/**
- *
+ * Processes the activity object
*
- * @param array $activity
- * @param $body
- * @param integer $uid User ID
- * @param $trust_source
+ * @param array $activity Array with activity data
+ * @param string $body
+ * @param integer $uid User ID
+ * @param boolean $trust_source Do we trust the source?
*/
public static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
{
- if (empty($activity['type'])) {
+ $type = JsonLD::fetchElement($activity, '@type');
+ if (!$type) {
logger('Empty type', LOGGER_DEBUG);
return;
}
- if (empty($activity['object'])) {
+ if (!JsonLD::fetchElement($activity, 'as:object')) {
logger('Empty object', LOGGER_DEBUG);
return;
}
- if (empty($activity['actor'])) {
+ if (!JsonLD::fetchElement($activity, 'as:actor')) {
logger('Empty actor', LOGGER_DEBUG);
return;
}
if (!$trust_source) {
- logger('No trust for activity type "' . $activity['type'] . '", so we quit now.', LOGGER_DEBUG);
+ logger('No trust for activity type "' . $type . '", so we quit now.', LOGGER_DEBUG);
return;
}
- switch ($activity['type']) {
- case 'Create':
- case 'Announce':
+ switch ($type) {
+ case 'as:Create':
+ case 'as:Announce':
ActivityPub\Processor::createItem($object_data, $body);
break;
- case 'Like':
+ case 'as:Like':
ActivityPub\Processor::likeItem($object_data, $body);
break;
- case 'Dislike':
+ case 'as:Dislike':
ActivityPub\Processor::dislikeItem($object_data, $body);
break;
- case 'Update':
- if (in_array($object_data['object_type'], ActivityPub::CONTENT_TYPES)) {
+ case 'as:Update':
+ if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
/// @todo
- } elseif (in_array($object_data['object_type'], ActivityPub::ACCOUNT_TYPES)) {
+ } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
ActivityPub\Processor::updatePerson($object_data, $body);
}
break;
- case 'Delete':
- if ($object_data['object_type'] == 'Tombstone') {
+ case 'as:Delete':
+ if ($object_data['object_type'] == 'as:Tombstone') {
ActivityPub\Processor::deleteItem($object_data, $body);
- } elseif (in_array($object_data['object_type'], ActivityPub::ACCOUNT_TYPES)) {
+ } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
ActivityPub\Processor::deletePerson($object_data, $body);
}
break;
- case 'Follow':
+ case 'as:Follow':
ActivityPub\Processor::followUser($object_data);
break;
- case 'Accept':
- if ($object_data['object_type'] == 'Follow') {
+ case 'as:Accept':
+ if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::acceptFollowUser($object_data);
}
break;
- case 'Reject':
- if ($object_data['object_type'] == 'Follow') {
+ case 'as:Reject':
+ if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::rejectFollowUser($object_data);
}
break;
- case 'Undo':
- if ($object_data['object_type'] == 'Follow') {
+ case 'as:Undo':
+ if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::undoFollowUser($object_data);
- } elseif (in_array($object_data['object_type'], ActivityPub::ACTIVITY_TYPES)) {
+ } elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) {
ActivityPub\Processor::undoActivity($object_data);
}
break;
default:
- logger('Unknown activity: ' . $activity['type'], LOGGER_DEBUG);
+ logger('Unknown activity: ' . $type, LOGGER_DEBUG);
break;
}
}
/**
- *
+ * Fetch the receiver list from an activity array
*
* @param array $activity
- * @param $actor
+ * @param string $actor
*
- * @return
+ * @return array with receivers (user id)
*/
private static function getReceivers($activity, $actor)
{
$receivers = [];
// When it is an answer, we inherite the receivers from the parent
- $replyto = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+ $replyto = JsonLD::fetchElement($activity, 'as:inReplyTo');
if (!empty($replyto)) {
$parents = Item::select(['uid'], ['uri' => $replyto]);
while ($parent = Item::fetch($parents)) {
$followers = '';
}
- foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
- if (empty($activity[$element])) {
+ foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+ $receiver_list = JsonLD::fetchElementArray($activity, $element);
+ if (empty($receiver_list)) {
continue;
}
- // The receiver can be an array or a string
- if (is_string($activity[$element])) {
- $activity[$element] = [$activity[$element]];
- }
-
- foreach ($activity[$element] as $receiver) {
- if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
+ foreach ($receiver_list as $receiver) {
+ if ($receiver == self::PUBLIC_COLLECTION) {
$receivers['uid:0'] = 0;
}
- if (($receiver == ActivityPub::PUBLIC_COLLECTION) && !empty($actor)) {
+ if (($receiver == self::PUBLIC_COLLECTION) && !empty($actor)) {
// This will most likely catch all OStatus connections to Mastodon
$condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]
, 'archive' => false, 'pending' => false];
DBA::close($contacts);
}
- if (in_array($receiver, [$followers, ActivityPub::PUBLIC_COLLECTION]) && !empty($actor)) {
+ if (in_array($receiver, [$followers, self::PUBLIC_COLLECTION]) && !empty($actor)) {
$condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
$contacts = DBA::select('contact', ['uid'], $condition);
private static function addActivityFields($object_data, $activity)
{
if (!empty($activity['published']) && empty($object_data['published'])) {
- $object_data['published'] = $activity['published'];
+ $object_data['published'] = JsonLD::fetchElement($activity, 'published', '@value');
}
if (!empty($activity['updated']) && empty($object_data['updated'])) {
- $object_data['updated'] = $activity['updated'];
+ $object_data['updated'] = JsonLD::fetchElement($activity, 'updated', '@value');
}
if (!empty($activity['diaspora:guid']) && empty($object_data['diaspora:guid'])) {
- $object_data['diaspora:guid'] = $activity['diaspora:guid'];
+ $object_data['diaspora:guid'] = JsonLD::fetchElement($activity, 'diaspora:guid');
}
if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) {
- $object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+ $object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo');
}
if (!empty($activity['instrument'])) {
}
/**
- *
+ * Fetches the object data from external ressources if needed
*
- * @param $object_id
- * @param $object
- * @param $trust_source
+ * @param string $object_id Object ID of the the provided object
+ * @param array $object The provided object array
+ * @param boolean $trust_source Do we trust the provided object?
*
- * @return
+ * @return array with trusted and valid object data
*/
private static function fetchObject($object_id, $object = [], $trust_source = false)
{
- if (!$trust_source || is_string($object)) {
+ // By fetching the type we check if the object is complete.
+ $type = JsonLD::fetchElement($object, '@type');
+
+ if (!$trust_source || empty($type)) {
$data = ActivityPub::fetchContent($object_id);
- if (empty($data)) {
- logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
- $data = $object_id;
- } else {
+ if (!empty($data)) {
+ $object = JsonLD::compact($data);
logger('Fetched content for ' . $object_id, LOGGER_DEBUG);
+ } else {
+ logger('Empty content for ' . $object_id . ', check if content is available locally.', LOGGER_DEBUG);
+
+ $item = Item::selectFirst([], ['uri' => $object_id]);
+ if (!DBA::isResult($item)) {
+ logger('Object with url ' . $object_id . ' was not found locally.', LOGGER_DEBUG);
+ return false;
+ }
+ logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
+ $data = ActivityPub\Transmitter::createNote($item);
+ $object = JsonLD::compact($data);
}
} else {
logger('Using original object for url ' . $object_id, LOGGER_DEBUG);
- $data = $object;
}
- if (is_string($data)) {
- $item = Item::selectFirst([], ['uri' => $data]);
- if (!DBA::isResult($item)) {
- logger('Object with url ' . $data . ' was not found locally.', LOGGER_DEBUG);
- return false;
- }
- logger('Using already stored item for url ' . $object_id, LOGGER_DEBUG);
- $data = ActivityPub\Transmitter::createNote($item);
- }
+ $type = JsonLD::fetchElement($object, '@type');
- if (empty($data['type'])) {
+ if (empty($type)) {
logger('Empty type', LOGGER_DEBUG);
return false;
}
- if (in_array($data['type'], ActivityPub::CONTENT_TYPES)) {
- return self::processObject($data);
+ if (in_array($type, self::CONTENT_TYPES)) {
+ return self::processObject($object);
}
- if ($data['type'] == 'Announce') {
- if (empty($data['object'])) {
+ if ($type == 'as:Announce') {
+ $object_id = JsonLD::fetchElement($object, 'object');
+ if (empty($object_id)) {
return false;
}
- return self::fetchObject($data['object']);
+ return self::fetchObject($object_id);
}
- logger('Unhandled object type: ' . $data['type'], LOGGER_DEBUG);
+ logger('Unhandled object type: ' . $type, LOGGER_DEBUG);
}
/**
- *
+ * Convert tags from JSON-LD format into a simplified format
*
- * @param $object
+ * @param array $tags Tags in JSON-LD format
*
- * @return
+ * @return array with tags in a simplified format
+ */
+ private static function processTags($tags)
+ {
+ $taglist = [];
+
+ if (empty($tags)) {
+ return [];
+ }
+
+ foreach ($tags as $tag) {
+ if (empty($tag)) {
+ continue;
+ }
+
+ $taglist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type')),
+ 'href' => JsonLD::fetchElement($tag, 'as:href'),
+ 'name' => JsonLD::fetchElement($tag, 'as:name')];
+ }
+ return $taglist;
+ }
+
+ /**
+ * Convert attachments from JSON-LD format into a simplified format
+ *
+ * @param array $attachments Attachments in JSON-LD format
+ *
+ * @return array with attachmants in a simplified format
+ */
+ private static function processAttachments($attachments)
+ {
+ $attachlist = [];
+
+ if (empty($attachments)) {
+ return [];
+ }
+
+ foreach ($attachments as $attachment) {
+ if (empty($attachment)) {
+ continue;
+ }
+
+ $attachlist[] = ['type' => str_replace('as:', '', JsonLD::fetchElement($attachment, '@type')),
+ 'mediaType' => JsonLD::fetchElement($attachment, 'as:mediaType'),
+ 'name' => JsonLD::fetchElement($attachment, 'as:name'),
+ 'url' => JsonLD::fetchElement($attachment, 'as:url')];
+ }
+ return $attachlist;
+ }
+
+ /**
+ * Fetches data from the object part of an activity
+ *
+ * @param array $object
+ *
+ * @return array
*/
private static function processObject($object)
{
- if (empty($object['id'])) {
+ if (!JsonLD::fetchElement($object, '@id')) {
return false;
}
$object_data = [];
- $object_data['object_type'] = $object['type'];
- $object_data['id'] = $object['id'];
+ $object_data['object_type'] = JsonLD::fetchElement($object, '@type');
+ $object_data['id'] = JsonLD::fetchElement($object, '@id');
- if (!empty($object['inReplyTo'])) {
- $object_data['reply-to-id'] = JsonLD::fetchElement($object, 'inReplyTo', 'id');
- } else {
+ $object_data['reply-to-id'] = JsonLD::fetchElement($object, 'as:inReplyTo');
+
+ if (empty($object_data['reply-to-id'])) {
$object_data['reply-to-id'] = $object_data['id'];
}
- $object_data['published'] = defaults($object, 'published', null);
- $object_data['updated'] = defaults($object, 'updated', $object_data['published']);
+ $object_data['published'] = JsonLD::fetchElement($object, 'as:published', '@value');
+ $object_data['updated'] = JsonLD::fetchElement($object, 'as:updated', '@value');
+
+ if (empty($object_data['updated'])) {
+ $object_data['updated'] = $object_data['published'];
+ }
if (empty($object_data['published']) && !empty($object_data['updated'])) {
$object_data['published'] = $object_data['updated'];
}
- $actor = JsonLD::fetchElement($object, 'attributedTo', 'id');
+ $actor = JsonLD::fetchElement($object, 'as:attributedTo');
if (empty($actor)) {
- $actor = defaults($object, 'actor', null);
- }
-
- $object_data['diaspora:guid'] = defaults($object, 'diaspora:guid', null);
- $object_data['owner'] = $object_data['author'] = $actor;
- $object_data['context'] = defaults($object, 'context', null);
- $object_data['conversation'] = defaults($object, 'conversation', null);
- $object_data['sensitive'] = defaults($object, 'sensitive', null);
- $object_data['name'] = defaults($object, 'title', null);
- $object_data['name'] = defaults($object, 'name', $object_data['name']);
- $object_data['summary'] = defaults($object, 'summary', null);
- $object_data['content'] = defaults($object, 'content', null);
- $object_data['source'] = defaults($object, 'source', null);
- $object_data['location'] = JsonLD::fetchElement($object, 'location', 'name', 'type', 'Place');
- $object_data['attachments'] = defaults($object, 'attachment', null);
- $object_data['tags'] = defaults($object, 'tag', null);
- $object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service');
- $object_data['alternate-url'] = JsonLD::fetchElement($object, 'url', 'href');
- $object_data['receiver'] = self::getReceivers($object, $object_data['owner']);
+ $actor = JsonLD::fetchElement($object, 'as:actor');
+ }
+
+ $object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid');
+ $object_data['diaspora:comment'] = JsonLD::fetchElement($object, 'diaspora:comment');
+ $object_data['actor'] = $object_data['author'] = $actor;
+ $object_data['context'] = JsonLD::fetchElement($object, 'as:context');
+ $object_data['conversation'] = JsonLD::fetchElement($object, 'ostatus:conversation');
+ $object_data['sensitive'] = JsonLD::fetchElement($object, 'as:sensitive');
+ $object_data['name'] = JsonLD::fetchElement($object, 'as:name');
+ $object_data['summary'] = JsonLD::fetchElement($object, 'as:summary');
+ $object_data['content'] = JsonLD::fetchElement($object, 'as:content');
+ $object_data['source'] = JsonLD::fetchElement($object, 'as:source', 'as:content', 'as:mediaType', 'text/bbcode');
+ $object_data['location'] = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place');
+ $object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment'));
+ $object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag'));
+// $object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service'); // todo
+ $object_data['service'] = null;
+ $object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url');
+
+ // Special treatment for Hubzilla links
+ if (is_array($object_data['alternate-url'])) {
+ if (!empty($object['as:url'])) {
+ $object_data['alternate-url'] = JsonLD::fetchElement($object['as:url'], 'as:href');
+ } else {
+ $object_data['alternate-url'] = null;
+ }
+ }
+
+ $object_data['receiver'] = self::getReceivers($object, $object_data['actor']);
// Common object data:
*
* To-Do:
*
+ * Missing object fields:
+ * - service (App)
+ * - location
+ *
* Missing object types:
* - Event
*
return $data;
}
+ /**
+ * Transmits a contact suggestion to a given inbox
+ *
+ * @param integer $uid User ID
+ * @param string $inbox Target inbox
+ * @param integer $suggestion_id Suggestion ID
+ */
+ public static function sendContactSuggestion($uid, $inbox, $suggestion_id)
+ {
+ $owner = User::getOwnerDataById($uid);
+ $profile = APContact::getByURL($owner['url']);
+
+ $suggestion = DBA::selectFirst('fsuggest', ['url', 'note', 'created'], ['id' => $suggestion_id]);
+
+ $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'type' => 'Announce',
+ 'actor' => $owner['url'],
+ 'object' => $suggestion['url'],
+ 'content' => $suggestion['note'],
+ 'published' => DateTimeFormat::utc($suggestion['created'] . '+00:00', DateTimeFormat::ATOM),
+ 'to' => [ActivityPub::PUBLIC_COLLECTION],
+ 'cc' => []];
+
+ $signed = LDSignature::sign($data, $owner);
+
+ logger('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', LOGGER_DEBUG);
+ HTTPSignature::transmit($signed, $inbox, $uid);
+ }
+
/**
* Transmits a profile deletion to a given inbox
*
{
jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
- $context = (object)['as' => 'https://www.w3.org/ns/activitystreams',
- 'w3sec' => 'https://w3id.org/security',
- 'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+ $context = (object)['as' => 'https://www.w3.org/ns/activitystreams#',
+ 'w3id' => 'https://w3id.org/security#',
'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
+ 'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+ 'diaspora' => (object)['@id' => 'https://diasporafoundation.org/ns/', '@type' => '@id'],
+ 'dc' => (object)['@id' => 'http://purl.org/dc/terms/', '@type' => '@id'],
'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
$jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
}
+ /**
+ * @brief Fetches an element array from a JSON array
+ *
+ * @param $array
+ * @param $element
+ * @param $key
+ *
+ * @return fetched element array
+ */
+ public static function fetchElementArray($array, $element, $key = '@id')
+ {
+ if (empty($array)) {
+ return null;
+ }
+
+ if (!isset($array[$element])) {
+ return null;
+ }
+
+ // If it isn't an array yet, make it to one
+ if (!is_int(key($array[$element]))) {
+ $array[$element] = [$array[$element]];
+ }
+
+ $elements = [];
+
+ foreach ($array[$element] as $entry) {
+ if (!is_array($entry)) {
+ $elements[] = $entry;
+ } elseif (!empty($entry[$key])) {
+ $elements[] = $entry[$key];
+ } else {
+ $elements[] = $entry;
+ }
+ }
+
+ return $elements;
+ }
+
/**
* @brief Fetches an element from a JSON array
*
*
* @return fetched element
*/
- public static function fetchElement($array, $element, $key, $type = null, $type_value = null)
+ public static function fetchElement($array, $element, $key = '@id', $type = null, $type_value = null)
{
if (empty($array)) {
- return false;
+ return null;
}
- if (empty($array[$element])) {
- return false;
+ if (!isset($array[$element])) {
+ return null;
}
- if (is_string($array[$element])) {
+ if (!is_array($array[$element])) {
return $array[$element];
}
- if (is_null($type_value)) {
- if (!empty($array[$element][$key])) {
- return $array[$element][$key];
- }
-
- if (!empty($array[$element][0][$key])) {
- return $array[$element][0][$key];
+ if (is_null($type) || is_null($type_value)) {
+ $element_array = self::fetchElementArray($array, $element, $key);
+ if (is_null($element_array)) {
+ return null;
}
- return false;
+ return array_shift($element_array);
}
- if (!empty($array[$element][$key]) && !empty($array[$element][$type]) && ($array[$element][$type] == $type_value)) {
- return $array[$element][$key];
+ $element_array = self::fetchElementArray($array, $element);
+ if (is_null($element_array)) {
+ return null;
}
- /// @todo Add array search
+ foreach ($element_array as $entry) {
+ if (isset($entry[$key]) && isset($entry[$type]) && ($entry[$type] == $type_value)) {
+ return $entry[$key];
+ }
+ }
- return false;
+ return null;
}
}
if ($cmd == Delivery::MAIL) {
} elseif ($cmd == Delivery::SUGGESTION) {
+ ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $item_id);
} elseif ($cmd == Delivery::RELOCATION) {
} elseif ($cmd == Delivery::REMOVAL) {
ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox);
/**
* Create variables used by tests.
*/
- protected function setUp()
+ public function setUp()
{
parent::setUp();
- // Reusable App object
- $this->app = BaseObject::getApp();
+ require_once __DIR__.'/../include/api.php';
// User data that the test database is populated with
$this->selfUser = [
namespace Friendica\Test;
+use Friendica\BaseObject;
+use Friendica\Core\Config;
use Friendica\Database\DBA;
use PHPUnit\DbUnit\DataSet\YamlDataSet;
use PHPUnit\DbUnit\TestCaseTrait;
*/
abstract class DatabaseTest extends TestCase
{
+ public function setUp()
+ {
+ // Reusable App object
+ $this->app = BaseObject::getApp();
- use TestCaseTrait;
+ Config::set('system', 'url', 'http://localhost');
+ Config::set('system', 'hostname', 'localhost');
+ Config::set('system', 'worker_dont_fork', true);
+ }
/**
* Get database connection.
--- /dev/null
+<?php
+
+namespace Friendica\Test\Util;
+
+
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
+
+trait VFSTrait
+{
+ /**
+ * @var vfsStreamDirectory The Stream Directory
+ */
+ protected $root;
+
+ protected function setUpVfsDir() {
+ // the used directories inside the App class
+ $structure = [
+ 'config' => [],
+ 'bin' => []
+ ];
+
+ // create a virtual directory and copy all needed files and folders to it
+ $this->root = vfsStream::setup('friendica', null, $structure);
+
+ $this->setConfigFile('config.ini.php');
+ $this->setConfigFile('settings.ini.php');
+ $this->setConfigFile('local.ini.php');
+ $this->setConfigFile('dbstructure.json');
+ }
+
+ protected function setConfigFile($filename)
+ {
+ $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+ '..' . DIRECTORY_SEPARATOR .
+ 'config' . DIRECTORY_SEPARATOR .
+ $filename;
+
+ if (file_exists($file)) {
+ vfsStream::newFile($filename)
+ ->at($this->root->getChild('config'))
+ ->setContent(file_get_contents($file));
+ }
+ }
+
+ protected function delConfigFile($filename)
+ {
+ if ($this->root->hasChild('config/' . $filename)) {
+ $this->root->removeChild('config/' . $filename);
+ }
+ }
+}
* This file is loaded by PHPUnit before any test.
*/
-use Friendica\App;
use PHPUnit\DbUnit\DataSet\YamlDataSet;
use PHPUnit\DbUnit\TestCaseTrait;
use PHPUnit\Framework\TestCase;
-require_once __DIR__.'/../boot.php';
-require_once __DIR__.'/../include/api.php';
-
-new App(dirname(__DIR__));
-
-\Friendica\Core\Config::set('system', 'url', 'http://localhost');
-\Friendica\Core\Config::set('system', 'hostname', 'localhost');
-\Friendica\Core\Config::set('system', 'worker_dont_fork', true);
-
// Backward compatibility
if (!class_exists(TestCase::class)) {
class_alias(PHPUnit_Framework_TestCase::class, TestCase::class);
--- /dev/null
+<?php
+
+namespace Friendica\Test\src\App;
+
+use Friendica\App\Mode;
+use Friendica\Test\Util\VFSTrait;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class ModeTest extends TestCase
+{
+ use VFSTrait;
+
+ public function setUp()
+ {
+ parent::setUp(); // TODO: Change the autogenerated stub
+
+ $this->setUpVfsDir();
+ }
+
+ public function testItEmpty()
+ {
+ $mode = new Mode($this->root->url());
+ $this->assertTrue($mode->isInstall());
+ $this->assertFalse($mode->isNormal());
+ }
+
+ public function testWithoutConfig()
+ {
+ $mode = new Mode($this->root->url());
+
+ $this->assertTrue($this->root->hasChild('config/local.ini.php'));
+
+ $this->delConfigFile('local.ini.php');
+
+ $this->assertFalse($this->root->hasChild('config/local.ini.php'));
+
+ $mode->determine();
+
+ $this->assertTrue($mode->isInstall());
+ $this->assertFalse($mode->isNormal());
+
+ $this->assertFalse($mode->has(Mode::LOCALCONFIGPRESENT));
+ }
+
+ public function testWithoutDatabase()
+ {
+ $dba = \Mockery::mock('alias:Friendica\Database\DBA');
+ $dba
+ ->shouldReceive('connected')
+ ->andReturn(false);
+
+ $mode = new Mode($this->root->url());
+ $mode->determine();
+
+ $this->assertFalse($mode->isNormal());
+ $this->assertTrue($mode->isInstall());
+
+ $this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
+ $this->assertFalse($mode->has(Mode::DBAVAILABLE));
+ }
+
+ public function testWithoutDatabaseSetup()
+ {
+ $dba = \Mockery::mock('alias:Friendica\Database\DBA');
+ $dba
+ ->shouldReceive('connected')
+ ->andReturn(true);
+ $dba
+ ->shouldReceive('fetchFirst')
+ ->with('SHOW TABLES LIKE \'config\'')
+ ->andReturn(false);
+
+ $mode = new Mode($this->root->url());
+ $mode->determine();
+
+ $this->assertFalse($mode->isNormal());
+ $this->assertTrue($mode->isInstall());
+
+ $this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
+ }
+
+ public function testWithMaintenanceMode()
+ {
+ $dba = \Mockery::mock('alias:Friendica\Database\DBA');
+ $dba
+ ->shouldReceive('connected')
+ ->andReturn(true);
+ $dba
+ ->shouldReceive('fetchFirst')
+ ->with('SHOW TABLES LIKE \'config\'')
+ ->andReturn(true);
+
+ $conf = \Mockery::mock('alias:Friendica\Core\Config');
+ $conf
+ ->shouldReceive('get')
+ ->with('system', 'maintenance')
+ ->andReturn(true);
+
+ $mode = new Mode($this->root->url());
+ $mode->determine();
+
+ $this->assertFalse($mode->isNormal());
+ $this->assertFalse($mode->isInstall());
+
+ $this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
+ $this->assertFalse($mode->has(Mode::MAINTENANCEDISABLED));
+ }
+
+ public function testNormalMode()
+ {
+ $dba = \Mockery::mock('alias:Friendica\Database\DBA');
+ $dba
+ ->shouldReceive('connected')
+ ->andReturn(true);
+ $dba
+ ->shouldReceive('fetchFirst')
+ ->with('SHOW TABLES LIKE \'config\'')
+ ->andReturn(true);
+
+ $conf = \Mockery::mock('alias:Friendica\Core\Config');
+ $conf
+ ->shouldReceive('get')
+ ->with('system', 'maintenance')
+ ->andReturn(false);
+
+ $mode = new Mode($this->root->url());
+ $mode->determine();
+
+ $this->assertTrue($mode->isNormal());
+ $this->assertFalse($mode->isInstall());
+
+ $this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
+ $this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
+ }
+}
use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Test\Util\Intercept;
+use Friendica\Test\Util\VFSTrait;
use org\bovigo\vfs\vfsStream;
use org\bovigo\vfs\vfsStreamDirectory;
use PHPUnit\Framework\TestCase;
abstract class ConsoleTest extends TestCase
{
+ use VFSTrait;
+
/**
* @var MultiUseConsole Extension of the basic Friendica Console for testing purpose
*/
*/
protected $app;
- /**
- * @var vfsStreamDirectory The Stream Directory
- */
- protected $root;
-
protected $stdout;
protected function setUp()
$this->setUpVfsDir();
+ // fake console.php for setting an executable
+ vfsStream::newFile('console.php')
+ ->at($this->root->getChild('bin'))
+ ->setContent('<? php');
+
// Reusable App object
$this->app = new App($this->root->url());
BaseObject::setApp($this->app);
protected function getExecutablePath() {
return $this->root->getChild('bin' . DIRECTORY_SEPARATOR . 'console.php')->url();
}
-
- private function setUpVfsDir() {
- // the used directories inside the App class
- $structure = [
- 'config' => [],
- 'bin' => []
- ];
-
- // create a virtual directory and copy all needed files and folders to it
- $this->root = vfsStream::setup('friendica', null, $structure);
-
- $this->setConfigFile('config.ini.php');
- $this->setConfigFile('settings.ini.php');
- $this->setConfigFile('local.ini.php');
- $this->setConfigFile('dbstructure.json');
-
- // fake console.php for setting an executable
- vfsStream::newFile('console.php')
- ->at($this->root->getChild('bin'))
- ->setContent('<? php');
- }
-
- private function setConfigFile($filename)
- {
- $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- '..' . DIRECTORY_SEPARATOR .
- 'config' . DIRECTORY_SEPARATOR .
- $filename;
-
- if (file_exists($file)) {
- vfsStream::newFile($filename)
- ->at($this->root->getChild('config'))
- ->setContent(file_get_contents($file));
- }
- }
}
projects / friendica.git / commitdiff