sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.7.0

Browse Source
This commit is contained in:
Neo committed 2025-12-19 16:00:35 -08:00
1 parent 517a5e1f70
commit 8ba7d43898
1933 files changed
+65613 -11332
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/api/GraphQL/Mutation.php
-2
View File
@@ -36,8 +36,6 @@ abstract class _Mutation
'follow' => new \IPS\core\api\GraphQL\Mutations\Follow(),
'unfollow' => new \IPS\core\api\GraphQL\Mutations\Unfollow(),
'markNotificationRead' => new \IPS\core\api\GraphQL\Mutations\MarkNotificationRead(),
'sessionStart' => new \IPS\core\api\GraphQL\Mutations\SessionStart(),
'sessionEnd' => new \IPS\core\api\GraphQL\Mutations\SessionEnd(),
'uploadAttachment' => new \IPS\core\api\GraphQL\Mutations\UploadAttachment(),
'deleteAttachment' => new \IPS\core\api\GraphQL\Mutations\DeleteAttachment(),
'ignoreMember' => new \IPS\core\api\GraphQL\Mutations\IgnoreUser(),
applications/core/api/GraphQL/Mutations/SessionEnd.php
-102
View File
@@ -1,102 +0,0 @@
<?php
/**
* @brief GraphQL: End a session for the user
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
* @license http://www.invisionpower.com/legal/standards/
* @package IPS Community Suite
* @since 02 Apr 2019
* @version SVN_VERSION_NUMBER
*/
namespace IPS\core\api\GraphQL\Mutations;
use GraphQL\Type\Definition\ObjectType;
use IPS\Api\GraphQL\TypeRegistry;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Register a push token for a specific user
*/
class _SessionEnd
{
/*
* @brief Query description
*/
public static $description = "End a user session";
/*
* Mutation arguments
*/
public function args()
{
return [
'token' => TypeRegistry::string()
];
}
/**
* Return the mutation return type
*/
public function type()
{
return \IPS\core\Api\GraphQL\TypeRegistry::member();
}
/**
* Resolves this mutation
* @todo this is basically copied and pasted from notifications.php which isn't ideal, so we
* might want to consider refactoring to abstract this functionality.
*
* @param mixed Value passed into this resolver
* @param array Arguments
* @param array Context values
* @return \IPS\forums\Forum
*/
public function resolve($val, $args)
{
if( !\IPS\Member::loggedIn()->member_id )
{
throw new \IPS\Api\GraphQL\SafeException( 'NOT_LOGGED_IN', 'GQL/0001/6', 403 );
}
\IPS\Db::i()->update( 'core_oauth_server_access_tokens', array( 'status' => 'revoked' ), array( 'member_id=? AND access_token=?', \IPS\Member::loggedIn()->member_id, \IPS\Dispatcher::i()->accessToken['access_token'] ) );
if ( isset( \IPS\Dispatcher::i()->accessToken['device_key'] ) )
{
\IPS\Db::i()->update( 'core_oauth_server_access_tokens', array( 'status' => 'revoked' ), array( 'member_id=? AND device_key=?', \IPS\Member::loggedIn()->member_id, \IPS\Dispatcher::i()->accessToken['device_key'] ) );
}
if ( isset( $args['token'] ) and $args['token'] )
{
try
{
$response = \IPS\Http\Url::ips('mobile/signout')->request()->login( \IPS\Settings::i()->mobile_app_id, \IPS\Settings::i()->mobile_app_secret )->post( array(
'member' => \IPS\Member::loggedIn()->member_id,
'token' => $args['token']
) )->decodeJson();
if ( $response->httpResponseCode != 200 )
{
throw new \DomainException( (string) $response );
}
if ( !$response['remainingDevices'] )
{
\IPS\Member::loggedIn()->members_bitoptions['mobile_notifications'] = FALSE;
\IPS\Member::loggedIn()->save();
}
}
catch ( \Exception $e )
{
\IPS\Log::log( $e, 'mobile-push-notifications' );
}
}
return \IPS\Member::loggedIn();
}
}
applications/core/api/GraphQL/Mutations/SessionStart.php
-116
View File
@@ -1,116 +0,0 @@
<?php
/**
* @brief GraphQL: Start a session for a user
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
* @license http://www.invisionpower.com/legal/standards/
* @package IPS Community Suite
* @since 20 Mar 2019
* @version SVN_VERSION_NUMBER
*/
namespace IPS\core\api\GraphQL\Mutations;
use GraphQL\Type\Definition\ObjectType;
use IPS\Api\GraphQL\TypeRegistry;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Register a push token for a specific user
*/
class _SessionStart
{
/*
* @brief Query description
*/
public static $description = "Start a session for an authenticated user";
/*
* Mutation arguments
*/
public function args()
{
return [
'token' => TypeRegistry::string()
];
}
/**
* Return the mutation return type
*/
public function type()
{
return \IPS\core\Api\GraphQL\TypeRegistry::member();
}
/**
* Resolves this mutation
* @todo this is basically copied and pasted from notifications.php which isn't ideal, so we
* might want to consider refactoring to abstract this functionality.
*
* @param mixed Value passed into this resolver
* @param array Arguments
* @param array Context values
* @return \IPS\forums\Forum
*/
public function resolve($val, $args)
{
if( !\IPS\Member::loggedIn()->member_id )
{
throw new \IPS\Api\GraphQL\SafeException( 'NOT_LOGGED_IN', 'GQL/0001/6', 403 );
}
if ( isset( $args['token'] ) and $args['token'] )
{
try
{
/* Register the token with the backend */
$response = \IPS\Http\Url::ips('mobile/signin')->request()->login( \IPS\Settings::i()->mobile_app_id, \IPS\Settings::i()->mobile_app_secret )->post( array(
'member' => \IPS\Member::loggedIn()->member_id,
'token' => $args['token']
) );
if ( !\in_array( $response->httpResponseCode, array( 200, 201 ) ) )
{
throw new \DomainException( (string) $response );
}
/* If we didn't already have notifications enabled, enable them and set the defaults */
if ( !\IPS\Member::loggedIn()->members_bitoptions['mobile_notifications'] )
{
\IPS\Member::loggedIn()->members_bitoptions['mobile_notifications'] = TRUE;
\IPS\Member::loggedIn()->save();
$notificationPreferences = \IPS\Db::i()->select( '*', 'core_notification_preferences', array( 'member_id=?', \IPS\Member::loggedIn()->member_id ) );
if ( \count( $notificationPreferences ) )
{
$keysToAddPushTo = array();
foreach ( $notificationPreferences as $row )
{
if ( \in_array( 'inline', explode( ',', $row['preference'] ) ) )
{
$keysToAddPushTo[] = $row['notification_key'];
}
}
if ( \count( $keysToAddPushTo ) )
{
\IPS\Db::i()->update( 'core_notification_preferences', "`preference` = IF( `preference` = '', 'push', CONCAT_WS( ',', `preference`, 'push' ) )", array( array( 'member_id=?', \IPS\Member::loggedIn()->member_id ), array( \IPS\Db::i()->in( 'notification_key', $keysToAddPushTo ) ) ) );
}
}
}
}
catch ( \Exception $e )
{
\IPS\Log::log( $e, 'mobile-push-notifications' );
}
}
return \IPS\Member::loggedIn();
}
}
applications/core/api/GraphQL/Queries/MobileMenu.php
-81
View File
@@ -1,81 +0,0 @@
<?php
/**
* @brief GraphQL: Mobile menu query
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
* @license http://www.invisionpower.com/legal/standards/
* @package IPS Community Suite
* @since 12 June 2019
* @version SVN_VERSION_NUMBER
*/
namespace IPS\core\api\GraphQL\Queries;
use GraphQL\Type\Definition\ObjectType;
use IPS\Api\GraphQL\TypeRegistry;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Mobile menu query for GraphQL API
*/
class _MobileMenu
{
/*
* @brief Query description
*/
public static $description = "Returns details of the mobile app menu";
/*
* Query arguments
*/
public function args()
{
return array();
}
/**
* Return the query return type
*/
public function type()
{
return TypeRegistry::listOf( \IPS\core\api\GraphQL\TypeRegistry::mobileMenu() );
}
/**
* Resolves this query
*
* @param mixed Value passed into this resolver
* @param array Arguments
* @param array Context values
* @return array
*/
public function resolve($val, $args, $context)
{
$return = array();
foreach ( \IPS\Db::i()->select( '*', 'core_mobileapp_menu', NULL, 'position' ) as $item )
{
if ( \IPS\Application::appIsEnabled( $item['app'] ) )
{
$class = 'IPS\\' . $item['app'] . '\extensions\core\MobileNavigation\\' . $item['extension'];
if ( class_exists( $class ) )
{
$object = new $class( json_decode( $item['config'], TRUE ), $item['id'], $item['permissions'] );
if ( $object->canView() )
{
$return[ $item['id'] ] = $object;
}
}
}
}
return $return;
}
}
applications/core/api/GraphQL/Query.php
-1
View File
@@ -46,7 +46,6 @@ abstract class _Query
'messengerConversation' => new \IPS\core\api\GraphQL\Queries\MessengerConversation(),
'messengerConversations' => new \IPS\core\api\GraphQL\Queries\MessengerConversations(),
'messengerFolders' => new \IPS\core\api\GraphQL\Queries\MessengerFolders(),
'mobileMenu' => new \IPS\core\api\GraphQL\Queries\MobileMenu(),
'notificationTypes' => new \IPS\core\api\GraphQL\Queries\NotificationTypes(),
'ourPicks' => new \IPS\core\api\GraphQL\Queries\OurPicks(),
'popularContributors' => new \IPS\core\api\GraphQL\Queries\PopularContributors(),
applications/core/api/GraphQL/TypeRegistry.php
-9
View File
@@ -38,7 +38,6 @@ class _TypeRegistry
protected static $group;
protected static $ignoreOption;
protected static $member;
protected static $mobileMenu;
protected static $language;
protected static $login;
protected static $messengerConversation;
@@ -151,14 +150,6 @@ class _TypeRegistry
{
return self::$member ?: (self::$member = new \IPS\core\api\GraphQL\Types\MemberType());
}
/**
* @return MobileMenuType
*/
public static function mobileMenu()
{
return self::$mobileMenu ?: (self::$mobileMenu = new \IPS\core\api\GraphQL\Types\MobileMenuType());
}
/**
* @return LanguageType
applications/core/api/GraphQL/Types/MemberType.php
+1 -1
View File
@@ -499,7 +499,7 @@ class _MemberType extends ObjectType
/* Specify filter in where clause */
$where = array();
$where[] = array( "notification_app IN('" . implode( "','", array_keys( \IPS\Application::enabledApplications() ) ) . "')" );
$where[] = array( "member=?", \IPS\Member::loggedIn()->member_id );
$where[] = array( "`member`=?", \IPS\Member::loggedIn()->member_id );
/* Are we filtering by unread status? */
if( isset( $args['unread'] ) && $args['unread'] !== NULL )
applications/core/api/GraphQL/Types/MobileMenuType.php
-81
View File
@@ -1,81 +0,0 @@
<?php
/**
* @brief GraphQL: Mobile Menu Type
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
* @license http://www.invisionpower.com/legal/standards/
* @package IPS Community Suite
* @since 12 June 2019
* @version SVN_VERSION_NUMBER
*/
namespace IPS\core\api\GraphQL\Types;
use GraphQL\Type\Definition\ObjectType;
use IPS\Api\GraphQL\TypeRegistry;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* Mobile Menu Type for GraphQL API
*/
class _MobileMenuType extends ObjectType
{
/**
* Get object type
*
* @return ObjectType
*/
public function __construct()
{
$config = [
'name' => 'core_MobileMenu',
'description' => 'Mobile menu item type',
'fields' => function () {
return [
'id' => [
'type' => TypeRegistry::id(),
'description' => "Item ID",
'resolve' => function ( $item ) {
return $item->id;
}
],
'class' => [
'type' => TypeRegistry::string(),
'description' => "Class which handles this item",
'resolve' => function ( $item ) {
return \get_class( $item );
}
],
'title' => [
'type' => TypeRegistry::string(),
'description' => "Menu item title",
'resolve' => function ($item) {
return $item->title();
}
],
'icon' => [
'type' => TypeRegistry::string(),
'description' => "Icon key for this item",
'resolve' => function ($item) {
return $item->icon();
}
],
'url' => [
'type' => TypeRegistry::url(),
'description' => "URL to content",
'resolve' => function ( $item ) {
return $item->link();
}
]
];
}
];
parent::__construct($config);
}
}
applications/core/api/GraphQL/Types/NotificationTypeType.php
+1 -1
View File
@@ -104,7 +104,7 @@ class _NotificationTypeType extends ObjectType
'type' => \IPS\core\api\GraphQL\TypeRegistry::notificationMethod(),
'description' => "Push notification method",
'resolve' => function ($type) {
if ( !isset( $type['push'] ) || !\count( $type['push'] ) || !\IPS\Settings::i()->mobile_app_id || !\IPS\Member::loggedIn()->members_bitoptions['mobile_notifications'] )
if ( !isset( $type['push'] ) || !\count( $type['push'] ) || !\IPS\Member::loggedIn()->members_bitoptions['mobile_notifications'] )
{
return NULL;
}
applications/core/api/GraphQL/Types/PollQuestionType.php
-1
View File
@@ -126,7 +126,6 @@ class _PollQuestionType extends ObjectType
'description' => "The choices for this question",
'resolve' => function ($question) {
$choices = array();
$canViewCount = \IPS\Member::loggedIn()->modPermission('can_edit_poll_votes');
foreach( $question['data']['choice'] as $idx => $choice )
{
applications/core/api/GraphQL/Types/SettingsType.php
-16
View File
@@ -106,22 +106,6 @@ class _SettingsType extends ObjectType
return \IPS\GeoLocation::enabled();
}
],
'mobileHomeBlocks' => [
'type' => TypeRegistry::listOf( TypeRegistry::string() ),
'resolve' => function () {
try
{
$parsed = json_decode( \IPS\Settings::i()->mobile_app_home_blocks_order, TRUE );
$blocksToShow = array_filter( $parsed );
return array_keys( $blocksToShow );
}
catch (\Exception $e)
{
return array("new_content", "active_users", "our_picks", "popular_contributors");
}
}
],
'version' => [
'type' => TypeRegistry::int(),
'resolve' => function () {
applications/core/api/GraphQL/Types/StatsType.php
+4 -2
View File
@@ -41,14 +41,16 @@ class _StatsType extends ObjectType
'type' => TypeRegistry::int(),
'description' => "Content count",
'resolve' => function () {
return ( isset( \IPS\Settings::i()->mobile_app_hide_stats ) && \IPS\Settings::i()->mobile_app_hide_stats ) ? NULL : static::getContentCount();
// Return null for now until GQL is fleshed out
return NULL;
}
],
'memberCount' => [
'type' => TypeRegistry::int(),
'description' => 'Member count',
'resolve' => function () {
return ( isset( \IPS\Settings::i()->mobile_app_hide_stats ) && \IPS\Settings::i()->mobile_app_hide_stats ) ? NULL : static::getMemberCount();
// Return null for now until GQL is fleshed out
return NULL;
}
]
];
applications/core/api/clubs.php
+16 -3
View File
@@ -28,7 +28,8 @@ class _clubs extends \IPS\Api\Controller
*
* @apiparam int page Page number
* @apiparam int perPage Number of results per page - defaults to 25
* @note For requests using an OAuth Access Token for a particular member, only clubs the authorized user can view will be included
* @apiparam int member_id Member ID to return only clubs the member is allowed to view.
* @note For requests using an OAuth Access Token for a particular member, only clubs the authorized user can view will be included and the member_id parameter will be ignored.
* @return \IPS\Api\PaginatedResponse<IPS\Member\Club>
*/
public function GETindex()
@@ -36,13 +37,25 @@ class _clubs extends \IPS\Api\Controller
$page = isset( \IPS\Request::i()->page ) ? \IPS\Request::i()->page : 1;
$perPage = isset( \IPS\Request::i()->perPage ) ? \IPS\Request::i()->perPage : 25;
$forMember = $this->member;
if( !$this->member AND isset( \IPS\Request::i()->member_id ) )
{
$forMember = \IPS\Member::load( \IPS\Request::i()->member_id );
if( !$forMember->member_id )
{
$forMember = NULL;
}
}
/* Return */
return new \IPS\Api\PaginatedResponse(
200,
\IPS\Member\Club::clubs( $this->member ?: NULL, array( ( $page - 1 ) * $perPage, $perPage ), 'created' ),
\IPS\Member\Club::clubs( $forMember, array( ( $page - 1 ) * $perPage, $perPage ), 'created' ),
$page,
'IPS\Member\Club',
\IPS\Member\Club::clubs( $this->member ?: NULL, array( ( $page - 1 ) * $perPage, $perPage ), 'created', FALSE, array(), NULL, TRUE ),
\IPS\Member\Club::clubs( $forMember, array( ( $page - 1 ) * $perPage, $perPage ), 'created', FALSE, array(), NULL, TRUE ),
$this->member,
$perPage
);
applications/core/api/groups.php
+6
View File
@@ -79,6 +79,7 @@ class _groups extends \IPS\Api\Controller
*
* @apiclientonly
* @param int $id ID Number
* @throws 2C358/3 CANNOT_DELETE The group can't be deleted
* @throws 1C358/2 INVALID_ID The group ID does not exist
* @return void
*/
@@ -92,6 +93,11 @@ class _groups extends \IPS\Api\Controller
throw new \OutOfRangeException;
}
if( !$group->canDelete() )
{
throw new \IPS\Api\Exception( 'CANNOT_DELETE', '2C358/3', 403 );
}
$group->delete();
return new \IPS\Api\Response( 200, NULL );
applications/core/api/hello.php
+1 -1
View File
@@ -37,7 +37,7 @@ class _hello extends \IPS\Api\Controller
return new \IPS\Api\Response( 200, array(
'communityName' => \IPS\Settings::i()->board_name,
'communityUrl' => \IPS\Settings::i()->base_url,
'ipsApplications' => \IPS\Application::load('core')->version,
'ipsVersion' => \IPS\Application::load('core')->version,
'ipsApplications' => array_filter( array_keys( \IPS\Application::applications() ), function( $k ) { return \in_array( $k, \IPS\IPS::$ipsApps ); } )
) );
}
applications/core/api/members.php
+8 -12
View File
@@ -570,7 +570,7 @@ class _members extends \IPS\Api\Controller
{
$classToFollow = 'IPS\\' . \IPS\Request::i()->followApp . '\\' . mb_ucfirst( \IPS\Request::i()->followArea );
if( !class_exists( $classToFollow ) or !array_key_exists( \IPS\Request::i()->follow_app, \IPS\Application::applications() ) )
if( !class_exists( $classToFollow ) or !array_key_exists( \IPS\Request::i()->followApp, \IPS\Application::applications() ) )
{
throw new \OutOfRangeException;
}
@@ -1193,19 +1193,15 @@ class _members extends \IPS\Api\Controller
/**
* POST /core/members/{id}/achievements/{badge}/awardbadge
* Acknowledge a warning
* Award a badge
*
* @param int $id ID Number
* @reqapiparam int $badgeId Badge to award
* @param int $logId The ID number of the log in core_achievements_log which will tell us specifically what ACTION caused this (eg what post was made)
* @param int $ruleId The ID number of the rule which matched that action which caused this badge to be awarded
* @param array $actor If member is 'subject', 'other' or both
* @param int $recognize The ID of the recognize table row (optional)
* @return \IPS\Member
* @throws 2C292/M INVALID_BADGE The badge could not be found //TODo error code
* @throws 2C292/N INVALID_ID The member could not be found //TODo error code
* @throws 2C292/13 INVALID_BADGE The badge could not be found
* @throws 2C292/14 INVALID_ID The member could not be found
*/
public function POSTitem_achievements_awardbadge( int $id, int $badgeId, int $logId, int $ruleId, array $actor, int $recognize=0 ): \IPS\Api\Response
public function POSTitem_achievements_awardbadge( int $id, int $badgeId ): \IPS\Api\Response
{
try
{
@@ -1223,15 +1219,15 @@ class _members extends \IPS\Api\Controller
}
catch( \OutOfRangeException $e )
{
throw new \IPS\Api\Exception( 'INVALID_BADGE', '2C292/W', 404 ); //TODO error code
throw new \IPS\Api\Exception( 'INVALID_BADGE', '2C292/13', 404 );
}
$member->awardBadge($id, $badgeId, $logId,$ruleId,$actor,$recognize);
$member->awardBadge($badge, 0, 0, ['subject'] );
return new \IPS\Api\Response( 200, $member->apiOutput( $this->member ) );
}
catch ( \OutOfRangeException $e )
{
throw new \IPS\Api\Exception( 'INVALID_ID', '2C292/N', 404 ); //TODO error code
throw new \IPS\Api\Exception( 'INVALID_ID', '2C292/14', 404 );
}
}
}
applications/core/api/webhooks.php
+1 -1
View File
@@ -62,7 +62,7 @@ class _webhooks extends \IPS\Api\Controller
/**
* DELETE /core/webhooks/{id}
* Deletes a webhooks
* Deletes a webhook
*
* @apiclientonly
* @param int $id ID Number