Skip to content

[stable22] keeping an illusion of consistency #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 1 commit into from
Jun 28, 2021
Merged

[stable22] keeping an illusion of consistency #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions lib/Api/v1/Circles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
use OCA\Circles\Exceptions\RequestBuilderException;
use OCA\Circles\Exceptions\SingleCircleNotFoundException;
use OCA\Circles\Model\Circle;
use OCA\Circles\Model\DeprecatedCircle;
use OCA\Circles\Model\DeprecatedMember;
use OCA\Circles\Model\Member;
use OCA\Circles\Service\CircleService;
use OCA\Circles\Service\FederatedUserService;
Expand All @@ -50,22 +48,22 @@ class Circles {
const API_VERSION = [0, 10, 0];

// Expose circle and member constants via API
const CIRCLES_PERSONAL = DeprecatedCircle::CIRCLES_PERSONAL;
const CIRCLES_SECRET = DeprecatedCircle::CIRCLES_SECRET;
const CIRCLES_CLOSED = DeprecatedCircle::CIRCLES_CLOSED;
const CIRCLES_PUBLIC = DeprecatedCircle::CIRCLES_PUBLIC;
const CIRCLES_ALL = DeprecatedCircle::CIRCLES_ALL;

const TYPE_USER = DeprecatedMember::TYPE_USER;
const TYPE_GROUP = DeprecatedMember::TYPE_GROUP;
const TYPE_MAIL = DeprecatedMember::TYPE_MAIL;
const TYPE_CONTACT = DeprecatedMember::TYPE_CONTACT;

const LEVEL_NONE = DeprecatedMember::LEVEL_NONE;
const LEVEL_MEMBER = DeprecatedMember::LEVEL_MEMBER;
const LEVEL_MODERATOR = DeprecatedMember::LEVEL_MODERATOR;
const LEVEL_ADMIN = DeprecatedMember::LEVEL_ADMIN;
const LEVEL_OWNER = DeprecatedMember::LEVEL_OWNER;
const CIRCLES_PERSONAL = 1;
const CIRCLES_SECRET = 2;
const CIRCLES_CLOSED = 4;
const CIRCLES_PUBLIC = 8;
const CIRCLES_ALL = 15;

const TYPE_USER = Member::TYPE_USER;
const TYPE_GROUP = Member::TYPE_GROUP;
const TYPE_MAIL = Member::TYPE_MAIL;
const TYPE_CONTACT = Member::TYPE_CONTACT;

const LEVEL_NONE = Member::LEVEL_NONE;
const LEVEL_MEMBER = Member::LEVEL_MEMBER;
const LEVEL_MODERATOR = Member::LEVEL_MODERATOR;
const LEVEL_ADMIN = Member::LEVEL_ADMIN;
const LEVEL_OWNER = Member::LEVEL_OWNER;


/**
Expand Down
8 changes: 8 additions & 0 deletions lib/Model/Member.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,14 @@ public function getUserType(): int {
return $this->userType;
}

/**
* @return int
* @deprecated 22.0.0
*/
public function getType(): int {
return $this->getUserType();
}


/**
* @param string $instance
Expand Down