Skip to content

shorten id on occ #1148

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

Open
ArtificialOwl wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −24
Open

shorten id on occ #1148

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
50 changes: 27 additions & 23 deletions lib/Command/MembersList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,24 +245,28 @@ protected function execute(InputInterface $input, OutputInterface $output): int
}

$table->appendRow(
[
$member->getCircleId(),
$member->getCircle()->getDisplayName(),
$member->getId(),
$member->getSingleId(),
Member::$TYPE[$member->getUserType()],
$member->hasBasedOn() ? Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()] : '',
$this->configService->displayFederatedUser(
$member,
$this->input->getOption('display-name')
),
($level > 0) ? Member::$DEF_LEVEL[$level] :
'(' . strtolower($member->getStatus()) . ')',
($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
$member->getInvitedBy(),
$this->input->getOption('display-name')
) : 'Unknown'
]
$this->filterRow(
[
$member->getCircleId(),
$member->getCircle()->getDisplayName(),
$member->getId(),
$member->getSingleId(),
Member::$TYPE[$member->getUserType()],
$member->hasBasedOn() ? Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()] : '',
$this->cut(
$this->configService->displayFederatedUser(
$member, $this->input->getOption('display-name')
), 40
),
$this->configService->displayInstance($member->getInstance()),
($level > 0) ? Member::$DEF_LEVEL[$level] :
'(' . strtolower($member->getStatus()) . ')',
($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
$member->getInvitedBy(), $this->input->getOption('display-name')
) : 'Unknown'
],
13
)
);
}

Expand Down Expand Up @@ -361,9 +365,9 @@ private function getMembers(
$node = new TreeNode(
$tree, new SimpleDataStore(
[
'circle' => $circle,
'member' => $member,
'cycling' => in_array($member->getSingleId(), $knownIds),
'circle' => $circle,
'member' => $member,
'cycling' => in_array($member->getSingleId(), $knownIds),
]
)
);
Expand All @@ -381,8 +385,8 @@ private function getMembers(
new TreeNode(
$tree, new SimpleDataStore(
[
'member' => $member,
'cycling' => in_array($member->getSingleId(), $knownIds)
'member' => $member,
'cycling' => in_array($member->getSingleId(), $knownIds)
]
)
);
Expand Down
32 changes: 31 additions & 1 deletion lib/Tools/Traits/TStringTools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,39 @@ protected function cut(string $line, int $length): string {
return $line;
}

return substr($line, 0, $length - 5) . ' (..)';
return substr($line, 0, $length - 5) . ' [..]';
}


/**
* @param array $row
* @param int $flag
* @param int $length
*
* @return array
*/
protected function filterRow(array $row, int $flag, int $length = 7): array {
if ($flag === 0) {
return $row;
}

$c = 1;
$length = $length + 5;

return array_map(
function ($value) use ($flag, $length, &$c) {
$n = $value;
if (($flag & $c) !== 0) {
$n = $this->cut($value, $length);
}
$c = $c * 2;

return $n;
}, $row
);
}


/**
* @param string $str1
* @param string $str2
Expand Down